diff --git a/build.sbt b/build.sbt
index aeebad715522..fd2c8c77e91a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -31,7 +31,7 @@ val graalVersion = "21.0.2"
 // Version used for the Graal/Truffle related Maven packages
 // Keep in sync with GraalVM.version. Do not change the name of this variable,
 // it is used by the Rust build script via regex matching.
-val graalMavenPackagesVersion = "23.1.2"
+val graalMavenPackagesVersion = "24.0.0"
 val targetJavaVersion         = "17"
 val defaultDevEnsoVersion     = "0.0.0-dev"
 val ensoVersion = sys.env.getOrElse(
diff --git a/distribution/bin/enso b/distribution/bin/enso
index c32e6ad5b5d9..439c7922b5fc 100755
--- a/distribution/bin/enso
+++ b/distribution/bin/enso
@@ -8,5 +8,5 @@ for opt in "$@"; do
 done
 
 
-exec java --module-path $COMP_PATH $EXTRA_OPTS $JAVA_OPTS -m org.enso.runtime/org.enso.EngineRunnerBootLoader "$@"
+exec java --module-path $COMP_PATH -Dorg.graalvm.language.enso.home=$COMP_PATH $EXTRA_OPTS $JAVA_OPTS -m org.enso.runtime/org.enso.EngineRunnerBootLoader "$@"
 exit
diff --git a/distribution/bin/enso.bat b/distribution/bin/enso.bat
index bc2867d4a16c..8480c9cd4f65 100644
--- a/distribution/bin/enso.bat
+++ b/distribution/bin/enso.bat
@@ -6,5 +6,5 @@ if /I %%A==--dump-graphs (
 set EXTRA_OPTS=%EXTRA_OPTS% -Dgraal.Dump=Truffle:1
 )
 )
-java --module-path %comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %*
+java --module-path %comp-dir% -Dorg.graalvm.language.enso.home=%comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %*
 exit /B %errorlevel%
diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE
index fe9fcdf82d23..0d2e0c4a670f 100644
--- a/distribution/engine/THIRD-PARTY/NOTICE
+++ b/distribution/engine/THIRD-PARTY/NOTICE
@@ -328,77 +328,82 @@ Copyright notices related to this dependency can be found in the directory `org.
 
 'js-language', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.js.js-language-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.js.js-language-24.0.0`.
 
 
 'llvm-api', licensed under the New BSD License (3-clause BSD license), is distributed with the engine.
 The license file can be found at `licenses/BSD-3-Clause`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.llvm.llvm-api-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.llvm.llvm-api-24.0.0`.
 
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-24.0.0`.
 
 
 'python-language', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-language-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-language-24.0.0`.
 
 
 'python-resources', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-resources-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-resources-24.0.0`.
 
 
 'regex', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.regex.regex-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.regex.regex-24.0.0`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-24.0.0`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-24.0.0`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-24.0.0`.
 
 
 'icu4j', licensed under the Unicode/ICU License, is distributed with the engine.
 The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.icu4j-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.icu4j-24.0.0`.
 
 
 'json', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.json-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.json-24.0.0`.
+
+
+'xz', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
+The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.xz-24.0.0`.
 
 
 'profiler-tool', licensed under the GNU General Public License, version 2, with the Classpath Exception, is distributed with the engine.
 The license file can be found at `licenses/GNU_General_Public_License__version_2__with_the_Classpath_Exception`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.profiler-tool-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.profiler-tool-24.0.0`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-24.0.0`.
 
 
 'truffle-nfi', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-24.0.0`.
 
 
 'truffle-nfi-libffi', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-libffi-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-libffi-24.0.0`.
 
 
 'jline', licensed under the The BSD License, is distributed with the engine.
@@ -451,11 +456,6 @@ The license file can be found at `licenses/MIT`.
 Copyright notices related to this dependency can be found in the directory `org.slf4j.slf4j-api-2.0.9`.
 
 
-'xz', licensed under the Public Domain, is distributed with the engine.
-The license file can be found at `licenses/Public_Domain`.
-Copyright notices related to this dependency can be found in the directory `org.tukaani.xz-1.9`.
-
-
 'cats-core_2.13', licensed under the MIT, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
 Copyright notices related to this dependency can be found in the directory `org.typelevel.cats-core_2.13-2.9.0`.
diff --git a/distribution/engine/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES b/distribution/engine/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
index 8d910c422f2a..321f8818a147 100644
--- a/distribution/engine/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
+++ b/distribution/engine/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
@@ -46,10 +46,6 @@
  * limitations under the License.
  */
 
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
diff --git a/distribution/engine/THIRD-PARTY/licenses/Public_Domain b/distribution/engine/THIRD-PARTY/licenses/Public_Domain
deleted file mode 100644
index 85265b0a8eaf..000000000000
--- a/distribution/engine/THIRD-PARTY/licenses/Public_Domain
+++ /dev/null
@@ -1 +0,0 @@
-Public domain
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-24.0.0/NOTICES
similarity index 60%
rename from distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-24.0.0/NOTICES
index 41e09bdd6c56..1a5489ef93cc 100644
--- a/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.2/NOTICES
+++ b/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-24.0.0/NOTICES
@@ -4,6 +4,14 @@ Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
 
 Copyright (c) 1998, 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 
+Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
 
 Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
deleted file mode 100644
index b2f56cdae464..000000000000
--- a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
new file mode 100644
index 000000000000..b2202edd74df
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
@@ -0,0 +1,7 @@
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/LICENSE b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-24.0.0/LICENSE
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/LICENSE
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-24.0.0/LICENSE
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.2/NOTICE b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-24.0.0/NOTICE
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.2/NOTICE
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-24.0.0/NOTICE
diff --git a/distribution/engine/THIRD-PARTY/org.tukaani.xz-1.9/NOTICE b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.xz-24.0.0/NOTICE
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.tukaani.xz-1.9/NOTICE
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.xz-24.0.0/NOTICE
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-24.0.0/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
similarity index 84%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
index 620163d430fd..f937a293cce2 100644
--- a/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
+++ b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
@@ -2,6 +2,8 @@ Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+
 Copyright (c) 2021 Werner Randelshofer, Switzerland.
 
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/NOTICE b/distribution/launcher/THIRD-PARTY/NOTICE
index 1e6a96b0bd32..313714dd0df7 100644
--- a/distribution/launcher/THIRD-PARTY/NOTICE
+++ b/distribution/launcher/THIRD-PARTY/NOTICE
@@ -143,27 +143,27 @@ Copyright notices related to this dependency can be found in the directory `org.
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-24.0.0`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-24.0.0`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-24.0.0`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-24.0.0`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-24.0.0`.
 
 
 'scala-java8-compat_2.13', licensed under the Apache-2.0, is distributed with the launcher.
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
deleted file mode 100644
index b2f56cdae464..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
new file mode 100644
index 000000000000..b2202edd74df
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
@@ -0,0 +1,7 @@
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
similarity index 84%
rename from distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
index 620163d430fd..f937a293cce2 100644
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
+++ b/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
@@ -2,6 +2,8 @@ Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+
 Copyright (c) 2021 Werner Randelshofer, Switzerland.
 
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
index 2b8908af4d3a..7e81d800be8a 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
@@ -23,20 +23,20 @@ Copyright notices related to this dependency can be found in the directory `com.
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-24.0.0`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-24.0.0`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-24.0.0`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-24.0.0`.
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
rename to distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
rename to distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
similarity index 65%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
rename to distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
index 0bcf5ca20516..70815536278e 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
@@ -2,6 +2,10 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 
 Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
 
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
 The above copyright notice and either this complete permission notice or at a
 
 copyright rights in the Software, and any and all patent rights owned or
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
rename to distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/NOTICE b/distribution/project-manager/THIRD-PARTY/NOTICE
index 8ca050bdc84a..c0a838885373 100644
--- a/distribution/project-manager/THIRD-PARTY/NOTICE
+++ b/distribution/project-manager/THIRD-PARTY/NOTICE
@@ -268,27 +268,27 @@ Copyright notices related to this dependency can be found in the directory `org.
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-24.0.0`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-24.0.0`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-24.0.0`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-24.0.0`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-24.0.0`.
 
 
 'reactive-streams', licensed under the CC0, is distributed with the project-manager.
diff --git a/distribution/project-manager/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES b/distribution/project-manager/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
index 8d910c422f2a..321f8818a147 100644
--- a/distribution/project-manager/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
+++ b/distribution/project-manager/THIRD-PARTY/com.google.flatbuffers.flatbuffers-java-24.3.25/NOTICES
@@ -46,10 +46,6 @@
  * limitations under the License.
  */
 
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
similarity index 100%
rename from distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-24.0.0/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
similarity index 100%
rename from distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-24.0.0/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
deleted file mode 100644
index b2f56cdae464..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
new file mode 100644
index 000000000000..b2202edd74df
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-24.0.0/NOTICES
@@ -0,0 +1,7 @@
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
similarity index 100%
rename from distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-24.0.0/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
similarity index 84%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
index 620163d430fd..f937a293cce2 100644
--- a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
+++ b/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-24.0.0/NOTICES
@@ -2,6 +2,8 @@ Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+
 Copyright (c) 2021 Werner Randelshofer, Switzerland.
 
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/UnresolvedSymbol.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/UnresolvedSymbol.java
index b772a8547f96..37a071256f65 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/UnresolvedSymbol.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/UnresolvedSymbol.java
@@ -132,7 +132,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@Bind("$node") Node node, @Cached("1") int ignore) {
+  Type getType(@Bind("$node") Node node) {
     var ctx = EnsoContext.get(node);
     return ctx.getBuiltins().function();
   }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java
index 1b69cc124a48..07113e3adf50 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/callable/function/Function.java
@@ -3,6 +3,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -14,6 +15,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import org.enso.interpreter.node.callable.InteropApplicationNode;
@@ -388,8 +390,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached(value = "1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().function();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().function();
   }
 
   public boolean isThunk() {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDate.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDate.java
index 6c4679d96744..2517ad1f5a2e 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDate.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDate.java
@@ -1,12 +1,12 @@
 package org.enso.interpreter.runtime.data;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -78,8 +78,8 @@ LocalTime asTime() throws UnsupportedMessageException {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().date();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().date();
   }
 
   @ExportMessage
@@ -93,8 +93,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().date();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().date();
   }
 
   @CompilerDirectives.TruffleBoundary
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDateTime.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDateTime.java
index 0cae721d84f0..8e4875a72683 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDateTime.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDateTime.java
@@ -1,12 +1,13 @@
 package org.enso.interpreter.runtime.data;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -220,8 +221,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().dateTime();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().dateTime();
   }
 
   @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDuration.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDuration.java
index fffd597fcac6..b8c69738f74a 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDuration.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoDuration.java
@@ -1,12 +1,12 @@
 package org.enso.interpreter.runtime.data;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -35,13 +35,13 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().duration();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().duration();
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().duration();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().duration();
   }
 
   @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoFile.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoFile.java
index c957d6f30553..7a804d241977 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoFile.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoFile.java
@@ -3,13 +3,14 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -360,7 +361,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().file();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().file();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeOfDay.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeOfDay.java
index b0acbe5bf172..eddfdd798711 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeOfDay.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeOfDay.java
@@ -2,12 +2,12 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -144,8 +144,8 @@ LocalDate asDate() throws UnsupportedMessageException {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().timeOfDay();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().timeOfDay();
   }
 
   @ExportMessage
@@ -159,8 +159,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().timeOfDay();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().timeOfDay();
   }
 
   @CompilerDirectives.TruffleBoundary
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeZone.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeZone.java
index 3893bbc4408c..c572e98d0d1c 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeZone.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoTimeZone.java
@@ -1,12 +1,12 @@
 package org.enso.interpreter.runtime.data;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -99,8 +99,8 @@ ZoneId asTimeZone() {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().timeZone();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().timeZone();
   }
 
   @ExportMessage
@@ -114,7 +114,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().timeZone();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().timeZone();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ManagedResource.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ManagedResource.java
index 085433d547d3..d23537aea36a 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ManagedResource.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ManagedResource.java
@@ -1,10 +1,10 @@
 package org.enso.interpreter.runtime.data;
 
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.lang.ref.PhantomReference;
 import org.enso.interpreter.dsl.Builtin;
 import org.enso.interpreter.runtime.EnsoContext;
@@ -75,8 +75,8 @@ public void close(EnsoContext context) {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().managedResource();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().managedResource();
   }
 
   @ExportMessage
@@ -90,7 +90,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().managedResource();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().managedResource();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/Ref.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/Ref.java
index 3ad6b7c501f1..8bf74270d09f 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/Ref.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/Ref.java
@@ -1,10 +1,10 @@
 package org.enso.interpreter.runtime.data;
 
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.Builtin;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
@@ -50,8 +50,8 @@ public Object setValue(Object value) {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().ref();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().ref();
   }
 
   @ExportMessage
@@ -65,7 +65,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().ref();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().ref();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java
index 878ef6ab7db4..d02517ca6426 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java
@@ -3,12 +3,12 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import java.util.ArrayList;
@@ -440,8 +440,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().function();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().function();
   }
 
   @ExportMessage
@@ -450,7 +450,7 @@ boolean hasMetaObject() {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().function();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().function();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
index e2ae5ac8ed11..3598a6795dbc 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.hash;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -10,6 +11,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.enso.interpreter.dsl.Builtin;
 import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
@@ -147,8 +149,8 @@ boolean hasType() {
   }
 
   @ExportMessage(library = TypesLibrary.class)
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().map();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().map();
   }
 
   @ExportMessage
@@ -157,8 +159,8 @@ boolean hasMetaObject() {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().map();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().map();
   }
 
   @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/text/Text.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/text/Text.java
index a0aa9906d75b..d4e5294101e8 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/text/Text.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/text/Text.java
@@ -2,11 +2,12 @@
 
 import com.ibm.icu.text.Normalizer2;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.Encoding;
 import java.util.ArrayDeque;
@@ -201,8 +202,8 @@ String toDisplayString(
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().text();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().text();
   }
 
   @ExportMessage
@@ -239,8 +240,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached(value = "1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().text();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().text();
   }
 
   /**
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
index 1b2b41ee8a3f..99f9917740dd 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.vector;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -141,8 +142,8 @@ String toDisplayString(boolean b) {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().array();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().array();
   }
 
   @ExportMessage
@@ -248,7 +249,7 @@ boolean isLimitReached(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsL
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().array();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().array();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
index 4320f2c1feb7..802c20949f2b 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.vector;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.interop.ArityException;
@@ -11,6 +12,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
@@ -84,8 +86,8 @@ boolean hasMetaObject() {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().array();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().array();
   }
 
   @Override
@@ -100,7 +102,7 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().array();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().array();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
index 99592b52e551..95ab97945622 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
@@ -176,12 +176,12 @@ boolean isLimitReached(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsL
   }
 
   @ExportMessage
-  boolean hasType(@Shared("ignore") @Cached("1") int ignore) {
+  boolean hasType() {
     return true;
   }
 
   @ExportMessage
-  Type getType(@Bind("$node") Node node, @Shared("ignore") @Cached("1") int ignore) {
+  Type getType(@Bind("$node") Node node) {
     var ctx = EnsoContext.get(node);
     return ctx.getBuiltins().array();
   }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
index 5ecb95cb26d4..9542719e0e0c 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.vector;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -73,8 +74,8 @@ String toDisplayString(boolean allowSideEffects) {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().vector();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().vector();
   }
 
   @ExportMessage
@@ -92,8 +93,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().vector();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().vector();
   }
 
   //
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/DataflowError.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/DataflowError.java
index 80e3faecf168..e3c8de84e9b7 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/DataflowError.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/DataflowError.java
@@ -3,11 +3,10 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
@@ -128,8 +127,8 @@ public String toDisplayString(boolean allowSideEffects) {
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().dataflowError();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().dataflowError();
   }
 
   @ExportMessage
@@ -178,7 +177,7 @@ boolean hasSpecialDispatch() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().dataflowError();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().dataflowError();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/PanicException.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/PanicException.java
index f64a2273f9e6..9fc608c994a3 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/PanicException.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/PanicException.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.error;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
@@ -144,13 +145,13 @@ Object getExceptionMessage(
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().panic();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().panic();
   }
 
   @ExportMessage
-  Type getMetaObject(@CachedLibrary("this") InteropLibrary thisLib) {
-    return EnsoContext.get(thisLib).getBuiltins().panic();
+  Type getMetaObject(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().panic();
   }
 
   @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
index 84b6e3d6a9cd..c4549e02bedf 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
@@ -1,11 +1,10 @@
 package org.enso.interpreter.runtime.error;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
@@ -245,8 +244,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().warning();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().warning();
   }
 
   public static Warning wrapMapError(WarningsLibrary warningsLib, Warning warning, long index) {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultBooleanExports.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultBooleanExports.java
index 66af16b6a9e0..490c2d9876a3 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultBooleanExports.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultBooleanExports.java
@@ -1,6 +1,5 @@
 package org.enso.interpreter.runtime.library.dispatch;
 
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -15,10 +14,7 @@ static boolean hasType(Boolean receiver) {
   }
 
   @ExportMessage
-  static Type getType(
-      Boolean receiver,
-      @CachedLibrary("receiver") TypesLibrary thisLib,
-      @Cached(value = "1") int ignore) {
+  static Type getType(Boolean receiver, @CachedLibrary("receiver") TypesLibrary thisLib) {
     return EnsoContext.get(thisLib).getBuiltins().bool().getType();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultDoubleExports.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultDoubleExports.java
index 9b36af017291..748da5ff6d86 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultDoubleExports.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultDoubleExports.java
@@ -1,6 +1,5 @@
 package org.enso.interpreter.runtime.library.dispatch;
 
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -15,10 +14,7 @@ static boolean hasType(Double receiver) {
   }
 
   @ExportMessage
-  static Type getType(
-      Double receiver,
-      @CachedLibrary("receiver") TypesLibrary thisLib,
-      @Cached(value = "1") int ignore) {
+  static Type getType(Double receiver, @CachedLibrary("receiver") TypesLibrary thisLib) {
     return EnsoContext.get(thisLib).getBuiltins().number().getFloat();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultLongExports.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultLongExports.java
index b0a9d49a43ad..1f2838001384 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultLongExports.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/DefaultLongExports.java
@@ -1,6 +1,5 @@
 package org.enso.interpreter.runtime.library.dispatch;
 
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -15,8 +14,7 @@ static boolean hasType(Long receiver) {
   }
 
   @ExportMessage
-  static Type getType(
-      Long receiver, @CachedLibrary("receiver") TypesLibrary thisLib, @Cached("1") int ignore) {
+  static Type getType(Long receiver, @CachedLibrary("receiver") TypesLibrary thisLib) {
     return EnsoContext.get(thisLib).getBuiltins().number().getInteger();
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java
index 9695465c4860..9937458c96e1 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java
@@ -1,12 +1,13 @@
 package org.enso.interpreter.runtime.number;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
 import java.math.BigInteger;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
@@ -139,8 +140,8 @@ boolean hasType() {
   }
 
   @ExportMessage
-  Type getType(@CachedLibrary("this") TypesLibrary thisLib, @Cached("1") int ignore) {
-    return EnsoContext.get(thisLib).getBuiltins().number().getInteger();
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().number().getInteger();
   }
 
   @Override
diff --git a/project/GraalVM.scala b/project/GraalVM.scala
index e271d7822d5e..06431bf264c5 100644
--- a/project/GraalVM.scala
+++ b/project/GraalVM.scala
@@ -10,7 +10,7 @@ import scala.collection.immutable.Seq
   */
 object GraalVM {
   // Keep in sync with graalMavenPackagesVersion in build.sbt
-  val version: String = "23.1.2"
+  val version: String = "24.0.0"
 
   /** The list of modules that are included in the `component` directory in engine distribution.
     * When invoking the `java` command, these modules need to be put on the module-path.
@@ -64,7 +64,7 @@ object GraalVM {
     "org.graalvm.tools"    % "profiler-tool"      % version,
     "org.graalvm.shadowed" % "json"               % version,
     "org.graalvm.shadowed" % "icu4j"              % version,
-    "org.tukaani"          % "xz"                 % "1.9"
+    "org.graalvm.shadowed" % "xz"                 % version
   )
 
   val jsPkgs = Seq(
diff --git a/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
rename to tools/legal-review/Base/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.collections-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.collections-24.0.0/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.collections-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-keep
rename to tools/legal-review/Base/org.graalvm.sdk.collections-24.0.0/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
similarity index 97%
rename from tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
index 9ed34bb03b2f..a43fc284220c 100644
--- a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
+++ b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
@@ -18,7 +18,6 @@ Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
similarity index 66%
rename from tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
rename to tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
index c9dcc9380fbe..73749dc57cad 100644
--- a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
+++ b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
@@ -2,3 +2,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
 The above copyright notice and either this complete permission notice or at a
 copyright rights in the Software, and any and all patent rights owned or
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.word-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.word-24.0.0/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.word-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-keep
rename to tools/legal-review/Base/org.graalvm.sdk.word-24.0.0/copyright-keep
diff --git a/tools/legal-review/Base/report-state b/tools/legal-review/Base/report-state
index 96be37964c55..d7741910a8a7 100644
--- a/tools/legal-review/Base/report-state
+++ b/tools/legal-review/Base/report-state
@@ -1,3 +1,3 @@
-DB9DA9C510DFA8BEC90E4783DC4B38250348A933AC619F8B23F524468A717D66
-4D34F128EF38C7A04EAF5F44292BD67D157A107CF70DDB04080515EEF6541AF1
+3C1492E81A27B2CAA831AD90F496EAC6E7F31D2C0B728B3BB18E49D93C991149
+E0C5A8781927F0BA473D87D6149D3914CBE9F03B03DF63C222227AE04E268908
 0
diff --git a/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore b/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore
deleted file mode 100644
index b2533413db42..000000000000
--- a/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-copyright notice, this list of conditions and the following disclaimer
-Redistributions of source code must retain the above copyright
diff --git a/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context b/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
index a778b24976ce..164071dbd76d 100644
--- a/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
+++ b/tools/legal-review/engine/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
@@ -1,4 +1,3 @@
 Copyright 2019 Google Inc. All rights reserved.
 Copyright 2017 Google Inc. All rights reserved.
 Copyright 2014 Google Inc. All rights reserved.
-Copyright 2008 Google Inc.  All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.js.js-language-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.js.js-language-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.js.js-language-24.0.0/copyright-keep
similarity index 60%
rename from tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.js.js-language-24.0.0/copyright-keep
index 3d44c2c879f3..9a7ee5a04745 100644
--- a/tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-keep
+++ b/tools/legal-review/engine/org.graalvm.js.js-language-24.0.0/copyright-keep
@@ -5,3 +5,7 @@ Copyright 2011 the V8 project authors. All rights reserved.
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
 Copyright (c) 1998, 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.llvm.llvm-api-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.llvm.llvm-api-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.llvm.llvm-api-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.llvm.llvm-api-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.python.python-language-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.python.python-language-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.python.python-language-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.python.python-language-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.python.python-resources-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.python.python-resources-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep-context b/tools/legal-review/engine/org.graalvm.python.python-resources-24.0.0/copyright-keep-context
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep-context
rename to tools/legal-review/engine/org.graalvm.python.python-resources-24.0.0/copyright-keep-context
diff --git a/tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.regex.regex-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.regex.regex-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.regex.regex-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.regex.regex-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.collections-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.collections-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.collections-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.sdk.collections-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
deleted file mode 100644
index b4c2cb61258b..000000000000
--- a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
similarity index 97%
rename from tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
index 40098cef90df..ddd6b91606f8 100644
--- a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
+++ b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
@@ -14,7 +14,6 @@ Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
new file mode 100644
index 000000000000..66324bdb809d
--- /dev/null
+++ b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
@@ -0,0 +1,4 @@
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.word-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.word-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.word-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.sdk.word-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/custom-license b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/custom-license
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/custom-license
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/custom-license
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/files-keep b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/files-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/files-keep
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-24.0.0/files-keep
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.json-23.1.2/files-add/NOTICE b/tools/legal-review/engine/org.graalvm.shadowed.json-24.0.0/files-add/NOTICE
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.json-23.1.2/files-add/NOTICE
rename to tools/legal-review/engine/org.graalvm.shadowed.json-24.0.0/files-add/NOTICE
diff --git a/tools/legal-review/engine/org.tukaani.xz-1.9/files-add/NOTICE b/tools/legal-review/engine/org.graalvm.shadowed.xz-24.0.0/files-add/NOTICE
similarity index 100%
rename from tools/legal-review/engine/org.tukaani.xz-1.9/files-add/NOTICE
rename to tools/legal-review/engine/org.graalvm.shadowed.xz-24.0.0/files-add/NOTICE
diff --git a/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.tools.profiler-tool-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.tools.profiler-tool-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.tools.profiler-tool-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.tools.profiler-tool-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
similarity index 84%
rename from tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
index 7fb2007bbe7a..fd8bb6be23db 100644
--- a/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
+++ b/tools/legal-review/engine/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
@@ -4,3 +4,4 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-24.0.0/copyright-keep
diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state
index 6d1f19d72516..10afd0ba4e69 100644
--- a/tools/legal-review/engine/report-state
+++ b/tools/legal-review/engine/report-state
@@ -1,3 +1,3 @@
-416F24D717DFDBF394B4B7392DD1F9B784D5B4C6B9F72E6C90902E0E02181FB6
-6525E0B8B6538AA3FCD626624DF7CCEA88BF6BFD4A9BA872F40915F037E2BAAF
+04F26D14EEE87D86068545C263A1459FF8E8E7AB7E5AB92AD65A35A61E3AD3F2
+27B287816C14571C5032AE4D27CC680B74E99DB22BA2134FE24BB8141A53426D
 0
diff --git a/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore b/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep b/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.collections-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.collections-24.0.0/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.collections-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.sdk.collections-24.0.0/copyright-keep
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
deleted file mode 100644
index b4c2cb61258b..000000000000
--- a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
similarity index 97%
rename from tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
index 40098cef90df..ddd6b91606f8 100644
--- a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
+++ b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
@@ -14,7 +14,6 @@ Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
new file mode 100644
index 000000000000..66324bdb809d
--- /dev/null
+++ b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
@@ -0,0 +1,4 @@
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.word-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.word-24.0.0/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.word-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.sdk.word-24.0.0/copyright-keep
diff --git a/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore b/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep b/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
similarity index 84%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
index 7fb2007bbe7a..fd8bb6be23db 100644
--- a/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
+++ b/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
@@ -4,3 +4,4 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/report-state b/tools/legal-review/launcher/report-state
index 5b1f107619b7..d0733e49d238 100644
--- a/tools/legal-review/launcher/report-state
+++ b/tools/legal-review/launcher/report-state
@@ -1,3 +1,3 @@
-9A1DF8B4A1C217C585B1A35E5EFE5601DA48970AD712F6C658255B3F58908740
-9FA7FD624B82CD0753D3E8D5A8B4CF8AFE2E985B3A36404BD657AD9E75BF4E25
+52820E03B0AB2FC9EE364890AFA1C4FBA09FBEE2BE460402AAC87D01D81760CF
+292EDE805E0D7AC7DACE7F585B8A7414C408D634164B0D0A8EE46BB35DA8D70B
 0
diff --git a/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore b/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore
deleted file mode 100644
index b2533413db42..000000000000
--- a/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-copyright notice, this list of conditions and the following disclaimer
-Redistributions of source code must retain the above copyright
diff --git a/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context b/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
index a778b24976ce..164071dbd76d 100644
--- a/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
+++ b/tools/legal-review/project-manager/com.google.flatbuffers.flatbuffers-java-24.3.25/copyright-keep-context
@@ -1,4 +1,3 @@
 Copyright 2019 Google Inc. All rights reserved.
 Copyright 2017 Google Inc. All rights reserved.
 Copyright 2014 Google Inc. All rights reserved.
-Copyright 2008 Google Inc.  All rights reserved.
diff --git a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-24.0.0/copyright-ignore
diff --git a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep b/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-24.0.0/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.collections-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.collections-24.0.0/copyright-ignore
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.collections-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.sdk.collections-24.0.0/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
deleted file mode 100644
index b4c2cb61258b..000000000000
--- a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
similarity index 97%
rename from tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
index 40098cef90df..ddd6b91606f8 100644
--- a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
+++ b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-ignore
@@ -14,7 +14,6 @@ Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
new file mode 100644
index 000000000000..66324bdb809d
--- /dev/null
+++ b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-24.0.0/copyright-keep
@@ -0,0 +1,4 @@
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.word-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.word-24.0.0/copyright-ignore
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.word-24.0.0/copyright-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.sdk.word-24.0.0/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-24.0.0/copyright-ignore
diff --git a/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep b/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
similarity index 84%
rename from tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
index 7fb2007bbe7a..fd8bb6be23db 100644
--- a/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
+++ b/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-24.0.0/copyright-keep
@@ -4,3 +4,4 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de> See
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/project-manager/report-state b/tools/legal-review/project-manager/report-state
index f291275bad7e..e65bf23c9202 100644
--- a/tools/legal-review/project-manager/report-state
+++ b/tools/legal-review/project-manager/report-state
@@ -1,3 +1,3 @@
-5DCEB0A37FD6967F3EA7670A6DD41E5C0872C1F0965EA07EAAAE2EF570F86141
-80340DDF269F12E05EFFFD1C297B42E4B4A5F7495ED69BC25933FCEFBA04EAA2
+3EC0A79D69F19BDC2EF5057FB00AB56EF2B8B54AA1EF862BE4D2FE4AF90D8024
+20282CD34777999BFA78524EF2C00CB18EE399E6E4F555878E0C7B352031FA50
 0