diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 15d762d74358..4e7eca4c9027 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -111,7 +111,7 @@ jobs:
       - name: Build the Launcher
         run: |
           sleep 1
-          sbt --no-colors launcher/buildNativeImage
+          sbt --no-colors "launcher/buildNativeImage"
       - name: Build the Runner & Runtime Uberjars
         run: |
           sleep 1
diff --git a/build.sbt b/build.sbt
index 5f260572b898..841ccbf8d127 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,7 +10,7 @@ import java.io.File
 // === Global Configuration ===================================================
 // ============================================================================
 
-val scalacVersion = "2.13.5"
+val scalacVersion = "2.13.6"
 val rustVersion   = "1.54.0-nightly"
 val graalVersion  = "21.1.0"
 val javaVersion   = "11"
@@ -117,7 +117,10 @@ ThisBuild / scalacOptions ++= Seq(
   "-language:higherKinds",              // Allow higher-kinded types
   "-language:implicitConversions",      // Allow definition of implicit functions called views
   "-unchecked",                         // Enable additional warnings where generated code depends on assumptions.
+  "-Vimplicits",                        // Prints implicit resolution chains when no implicit can be found.
+  "-Vtype-diffs",                       // Prints type errors as coloured diffs between types.
   "-Xcheckinit",                        // Wrap field accessors to throw an exception on uninitialized access.
+  "-Xfatal-warnings",                   // Make warnings fatal so they don't make it onto main (use @nowarn for local suppression)
   "-Xlint:adapted-args",                // Warn if an argument list is modified to match the receiver.
   "-Xlint:constant",                    // Evaluation of a constant arithmetic expression results in an error.
   "-Xlint:delayedinit-select",          // Selecting member of DelayedInit.
@@ -136,13 +139,12 @@ ThisBuild / scalacOptions ++= Seq(
   "-Ywarn-dead-code",                   // Warn when dead code is identified.
   "-Ywarn-extra-implicit",              // Warn when more than one implicit parameter section is defined.
   "-Ywarn-numeric-widen",               // Warn when numerics are widened.
-  "-Ywarn-unused:imports",              // Warn if an import selector is not referenced.
   "-Ywarn-unused:implicits",            // Warn if an implicit parameter is unused.
+  "-Ywarn-unused:imports",              // Warn if an import selector is not referenced.
   "-Ywarn-unused:locals",               // Warn if a local definition is unused.
-  "-Ywarn-unused:patvars",              // Warn if a variable bound in a pattern is unused.
-  "-Ywarn-unused:privates",             // Warn if a private member is unused.
   "-Ywarn-unused:params",               // Warn if a value parameter is unused.
-  "-Xfatal-warnings"                    // Make warnings fatal so they don't make it onto main (use @nowarn for local suppression)
+  "-Ywarn-unused:patvars",              // Warn if a variable bound in a pattern is unused.
+  "-Ywarn-unused:privates"              // Warn if a private member is unused.
 )
 
 val jsSettings = Seq(
@@ -344,16 +346,6 @@ val scalaCompiler = Seq(
   "org.scala-lang" % "scala-compiler" % scalacVersion
 )
 
-// === Splain =================================================================
-
-val splainVersion = "0.5.8"
-val splainOptions = Seq(
-  "-P:splain:infix:true",
-  "-P:splain:foundreq:true",
-  "-P:splain:implicits:true",
-  "-P:splain:tree:true"
-)
-
 // === std-lib ================================================================
 
 val icuVersion = "67.1"
@@ -376,7 +368,7 @@ val directoryWatcherVersion = "0.9.10"
 val flatbuffersVersion      = "1.12.0"
 val guavaVersion            = "29.0-jre"
 val jlineVersion            = "3.19.0"
-val kindProjectorVersion    = "0.11.3"
+val kindProjectorVersion    = "0.13.0"
 val mockitoScalaVersion     = "1.14.8"
 val newtypeVersion          = "0.4.4"
 val pprintVersion           = "0.5.9"
@@ -582,11 +574,7 @@ lazy val graph = (project in file("lib/scala/graph/"))
     ),
     addCompilerPlugin(
       "org.typelevel" %% "kind-projector" % kindProjectorVersion cross CrossVersion.full
-    ),
-    addCompilerPlugin(
-      "io.tryp" % "splain" % splainVersion cross CrossVersion.patch
-    ),
-    scalacOptions ++= splainOptions
+    )
   )
 
 lazy val pkg = (project in file("lib/scala/pkg"))
@@ -725,8 +713,8 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager"))
     rebuildNativeImage := NativeImage
       .buildNativeImage(
         "project-manager",
-        staticOnLinux = true,
-        initializeAtRuntime = Seq("scala.util.Random"),
+        staticOnLinux       = true,
+        initializeAtRuntime = Seq("scala.util.Random")
       )
       .dependsOn(VerifyReflectionSetup.run)
       .dependsOn(assembly)
@@ -823,11 +811,7 @@ lazy val `core-definition` = (project in file("lib/scala/core-definition"))
     ),
     addCompilerPlugin(
       "org.typelevel" %% "kind-projector" % kindProjectorVersion cross CrossVersion.full
-    ),
-    addCompilerPlugin(
-      "io.tryp" % "splain" % splainVersion cross CrossVersion.patch
-    ),
-    scalacOptions ++= splainOptions
+    )
   )
   .dependsOn(graph)
   .dependsOn(syntax.jvm)
@@ -893,10 +877,6 @@ lazy val `polyglot-api` = project
     addCompilerPlugin(
       "org.typelevel" %% "kind-projector" % kindProjectorVersion cross CrossVersion.full
     ),
-    addCompilerPlugin(
-      "io.tryp" % "splain" % splainVersion cross CrossVersion.patch
-    ),
-    scalacOptions ++= splainOptions,
     GenerateFlatbuffers.flatcVersion := flatbuffersVersion,
     Compile / sourceGenerators += GenerateFlatbuffers.task
   )
@@ -1033,11 +1013,7 @@ lazy val runtime = (project in file("engine/runtime"))
     ),
     addCompilerPlugin(
       "org.typelevel" %% "kind-projector" % kindProjectorVersion cross CrossVersion.full
-    ),
-    addCompilerPlugin(
-      "io.tryp" % "splain" % splainVersion cross CrossVersion.patch
-    ),
-    scalacOptions ++= splainOptions
+    )
   )
   .settings(
     (Compile / compile) := (Compile / compile)
diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE
index 4d1d67811dac..95b12bd1ce47 100644
--- a/distribution/engine/THIRD-PARTY/NOTICE
+++ b/distribution/engine/THIRD-PARTY/NOTICE
@@ -71,11 +71,6 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `com.beachape.enumeratum-macros_2.13-1.6.1`.
 
 
-'scala-reflect', licensed under the Apache-2.0, is distributed with the engine.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.5`.
-
-
 'auto-common', licensed under the Apache 2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.google.auto.auto-common-0.10`.
@@ -161,6 +156,11 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.google.errorprone.error_prone_annotations-2.3.4`.
 
 
+'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.6`.
+
+
 'reactive-streams', licensed under the CC0, is distributed with the engine.
 The license file can be found at `licenses/CC0`.
 Copyright notices related to this dependency can be found in the directory `org.reactivestreams.reactive-streams-1.0.2`.
@@ -306,9 +306,9 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
 
 
-'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
+'scala-reflect', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.5`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.6`.
 
 
 'alleycats-core_2.13', licensed under the MIT, is distributed with the engine.
@@ -336,6 +336,11 @@ The license file can be found at `licenses/Bouncy_Castle_Licence.txt`.
 Copyright notices related to this dependency can be found in the directory `org.bouncycastle.bcprov-jdk15on-1.65`.
 
 
+'scala-library', licensed under the Apache-2.0, is distributed with the engine.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.6`.
+
+
 'circe-yaml_2.13', licensed under the Apache 2.0, 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 `io.circe.circe-yaml_2.13-0.13.1`.
@@ -351,11 +356,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.google.flatbuffers.flatbuffers-java-1.12.0`.
 
 
-'scala-library', licensed under the Apache-2.0, is distributed with the engine.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.5`.
-
-
 'jackson-databind', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-databind-2.11.1`.
diff --git a/distribution/engine/THIRD-PARTY/com.google.errorprone.error_prone_annotations-2.3.4/NOTICES b/distribution/engine/THIRD-PARTY/com.google.errorprone.error_prone_annotations-2.3.4/NOTICES
index da6f3cd143cb..040d0daf3805 100644
--- a/distribution/engine/THIRD-PARTY/com.google.errorprone.error_prone_annotations-2.3.4/NOTICES
+++ b/distribution/engine/THIRD-PARTY/com.google.errorprone.error_prone_annotations-2.3.4/NOTICES
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Error Prone Authors.
+ * Copyright 2014 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright 2015 The Error Prone Authors.
+ * Copyright 2016 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
  */
 
 /*
- * Copyright 2014 The Error Prone Authors.
+ * Copyright 2017 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  */
 
 /*
- * Copyright 2017 The Error Prone Authors.
+ * Copyright 2015 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICE b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICE
similarity index 89%
rename from distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICE
rename to distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICE
index ac3a26b40f48..ba6f890b920f 100644
--- a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICE
+++ b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICE
@@ -1,6 +1,6 @@
 Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICES b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICES
similarity index 81%
rename from distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICES
rename to distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICES
index cb45ba3845b2..3893318899a8 100644
--- a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.5/NOTICES
+++ b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-compiler-2.13.6/NOTICES
@@ -1,5 +1,7 @@
 Copyright 2005-2013 LAMP/EPFL
 
+Copyright 2002-2017 LAMP/EPFL and Lightbend, Inc.
+
 Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc
 
 Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc.
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
similarity index 89%
rename from distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
rename to distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
index ac3a26b40f48..ba6f890b920f 100644
--- a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
+++ b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
@@ -1,6 +1,6 @@
 Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
new file mode 100644
index 000000000000..08f2bced90e8
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
@@ -0,0 +1,3 @@
+Copyright (C) 2011 The Guava Authors
+
+Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
similarity index 89%
rename from distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
rename to distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
index ac3a26b40f48..ba6f890b920f 100644
--- a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
+++ b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
@@ -1,6 +1,6 @@
 Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
diff --git a/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES b/distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES
rename to distribution/engine/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES b/distribution/engine/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
index 788494853651..c2bba08c1748 100644
--- a/distribution/engine/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
+++ b/distribution/engine/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* Copyright (c) 2008 Google Inc.
-
 // Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
 // www.source-code.biz, www.inventec.ch/chdh
+
+/* Copyright (c) 2008 Google Inc.
diff --git a/distribution/launcher/THIRD-PARTY/NOTICE b/distribution/launcher/THIRD-PARTY/NOTICE
index ea045f4ec352..47722f33ca9c 100644
--- a/distribution/launcher/THIRD-PARTY/NOTICE
+++ b/distribution/launcher/THIRD-PARTY/NOTICE
@@ -31,11 +31,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-slf4j_2.13-2.6.6`.
 
 
-'scala-reflect', licensed under the Apache-2.0, is distributed with the launcher.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.5`.
-
-
 'akka-actor_2.13', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor_2.13-2.6.6`.
@@ -111,11 +106,21 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
 
 
+'scala-reflect', licensed under the Apache-2.0, is distributed with the launcher.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.6`.
+
+
 'circe-numbers_2.13', licensed under the Apache 2.0, is distributed with the launcher.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-numbers_2.13-0.14.0-M1`.
 
 
+'scala-library', licensed under the Apache-2.0, is distributed with the launcher.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.6`.
+
+
 'circe-yaml_2.13', licensed under the Apache 2.0, is distributed with the launcher.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-yaml_2.13-0.13.1`.
@@ -126,11 +131,6 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-parser_2.13-0.14.0-M1`.
 
 
-'scala-library', licensed under the Apache-2.0, is distributed with the launcher.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.5`.
-
-
 'circe-generic_2.13', licensed under the Apache 2.0, is distributed with the launcher.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-generic_2.13-0.14.0-M1`.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
similarity index 89%
rename from distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
rename to distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
index ac3a26b40f48..ba6f890b920f 100644
--- a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
+++ b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
@@ -1,6 +1,6 @@
 Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
new file mode 100644
index 000000000000..08f2bced90e8
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
@@ -0,0 +1,3 @@
+Copyright (C) 2011 The Guava Authors
+
+Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
deleted file mode 100644
index ac3a26b40f48..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
new file mode 100644
index 000000000000..ba6f890b920f
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
@@ -0,0 +1,16 @@
+Scala
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES b/distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES b/distribution/launcher/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
index 788494853651..c2bba08c1748 100644
--- a/distribution/launcher/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
+++ b/distribution/launcher/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* Copyright (c) 2008 Google Inc.
-
 // Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
 // www.source-code.biz, www.inventec.ch/chdh
+
+/* Copyright (c) 2008 Google Inc.
diff --git a/distribution/project-manager/THIRD-PARTY/NOTICE b/distribution/project-manager/THIRD-PARTY/NOTICE
index b36f19f6e8ae..3242b7c5f059 100644
--- a/distribution/project-manager/THIRD-PARTY/NOTICE
+++ b/distribution/project-manager/THIRD-PARTY/NOTICE
@@ -66,11 +66,6 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `com.beachape.enumeratum-macros_2.13-1.6.1`.
 
 
-'scala-reflect', licensed under the Apache-2.0, is distributed with the project-manager.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.5`.
-
-
 'akka-actor_2.13', licensed under the Apache-2.0, is distributed with the project-manager.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor_2.13-2.6.6`.
@@ -201,6 +196,11 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
 
 
+'scala-reflect', licensed under the Apache-2.0, is distributed with the project-manager.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.6`.
+
+
 'jackson-dataformat-cbor', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.11.1`.
@@ -216,6 +216,11 @@ The license file can be found at `licenses/Bouncy_Castle_Licence.txt`.
 Copyright notices related to this dependency can be found in the directory `org.bouncycastle.bcprov-jdk15on-1.65`.
 
 
+'scala-library', licensed under the Apache-2.0, is distributed with the project-manager.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.6`.
+
+
 'circe-yaml_2.13', licensed under the Apache 2.0, is distributed with the project-manager.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-yaml_2.13-0.13.1`.
@@ -241,11 +246,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.google.flatbuffers.flatbuffers-java-1.12.0`.
 
 
-'scala-library', licensed under the Apache-2.0, is distributed with the project-manager.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.5`.
-
-
 'jackson-databind', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-databind-2.11.1`.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
deleted file mode 100644
index ac3a26b40f48..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.5/NOTICES
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
new file mode 100644
index 000000000000..ba6f890b920f
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICE
@@ -0,0 +1,16 @@
+Scala
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
new file mode 100644
index 000000000000..08f2bced90e8
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-library-2.13.6/NOTICES
@@ -0,0 +1,3 @@
+Copyright (C) 2011 The Guava Authors
+
+Copyright EPFL and Lightbend, Inc.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
deleted file mode 100644
index ac3a26b40f48..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-Scala
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
new file mode 100644
index 000000000000..ba6f890b920f
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICE
@@ -0,0 +1,16 @@
+Scala
+Copyright (c) 2002-2021 EPFL
+Copyright (c) 2011-2021 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This software includes projects with other licenses -- see `doc/LICENSE.md`.
diff --git a/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES b/distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
similarity index 100%
rename from distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.5/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.scala-lang.scala-reflect-2.13.6/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES b/distribution/project-manager/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
index 788494853651..c2bba08c1748 100644
--- a/distribution/project-manager/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
+++ b/distribution/project-manager/THIRD-PARTY/org.yaml.snakeyaml-1.26/NOTICES
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* Copyright (c) 2008 Google Inc.
-
 // Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
 // www.source-code.biz, www.inventec.ch/chdh
+
+/* Copyright (c) 2008 Google Inc.
diff --git a/project/NativeImage.scala b/project/NativeImage.scala
index 30c9666b73d8..9f030320585a 100644
--- a/project/NativeImage.scala
+++ b/project/NativeImage.scala
@@ -47,7 +47,7 @@ object NativeImage {
     staticOnLinux: Boolean,
     initializeAtBuildtime: Boolean    = true,
     additionalOptions: Seq[String]    = Seq.empty,
-    memoryLimitMegabytes: Option[Int] = Some(3584),
+    memoryLimitMegabytes: Option[Int] = Some(3840),
     initializeAtRuntime: Seq[String]  = Seq.empty
   ): Def.Initialize[Task[Unit]] = Def
     .task {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 602a9d46381a..9c13f4f3debe 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.eed3si9n"       % "sbt-assembly"             % "0.15.0")
 addSbtPlugin("ch.epfl.scala"      % "sbt-bloop"                % "1.4.4")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.5.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.5.1")
 addSbtPlugin("com.typesafe.sbt"   % "sbt-license-report"       % "1.2.0")
diff --git a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-ignore b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-ignore
similarity index 82%
rename from tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-ignore
rename to tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-ignore
index c695f36ec945..7dd0826cf459 100644
--- a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-ignore
+++ b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-ignore
@@ -1,6 +1,5 @@
 "A footer on every Scaladoc page, by default the EPFL/Lightbend copyright notice. Can be overridden with a custom footer.",
-Copyright 2002-2017 LAMP/EPFL and Lightbend, Inc.
-Div(id = "footer", elems = Txt("Scala programming documentation. Copyright (c) 2002-2020 ") :: A(href = "https://www.epfl.ch", target = "_top", elems = Txt("EPFL")) :: Txt(" and ") :: A(href = "https://www.lightbend.com", target = "_top", elems = Txt("Lightbend")) :: Txt("."))
+Div(id = "footer", elems = Txt("Scala programming documentation. Copyright (c) 2002-2021 ") :: A(href = "https://www.epfl.ch", target = "_top", elems = Txt("EPFL")) :: Txt(" and ") :: A(href = "https://www.lightbend.com", target = "_top", elems = Txt("Lightbend")) :: Txt("."))
 Properties.copyrightString
 rem # Copyright EPFL and Lightbend, Inc.
 rem # additional information regarding copyright ownership.
diff --git a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-keep b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-keep
similarity index 81%
rename from tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-keep
rename to tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-keep
index f0ab86a1d778..826fec04eaa3 100644
--- a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/copyright-keep
+++ b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/copyright-keep
@@ -1,3 +1,4 @@
+Copyright 2002-2017 LAMP/EPFL and Lightbend, Inc.
 Copyright 2005-2013 LAMP/EPFL
 Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc
 Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/files-ignore b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/files-ignore
rename to tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/files-ignore
diff --git a/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/files-keep b/tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.5/files-keep
rename to tools/legal-review/engine/org.scala-lang.scala-compiler-2.13.6/files-keep
diff --git a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-keep b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-keep
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-keep
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-ignore b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-ignore
similarity index 79%
rename from tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-ignore
rename to tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-ignore
index b875119e5f68..1c3cacd24d28 100644
--- a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/copyright-ignore
+++ b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-ignore
@@ -1,3 +1,3 @@
-val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2020, LAMP/EPFL and Lightbend, Inc.")
 case _                      => "No copyright"
 private[scala] def versionFor(command: String) = s"Scala $command $versionString -- $copyrightString"
+val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2021, LAMP/EPFL and Lightbend, Inc.")
diff --git a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-keep b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-keep
new file mode 100644
index 000000000000..34553c16ca91
--- /dev/null
+++ b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/copyright-keep
@@ -0,0 +1,2 @@
+Copyright (C) 2011 The Guava Authors
+Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/files-ignore b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/files-ignore
rename to tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/files-ignore
diff --git a/tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/files-keep b/tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-library-2.13.5/files-keep
rename to tools/legal-review/engine/org.scala-lang.scala-library-2.13.6/files-keep
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/copyright-keep b/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/copyright-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/copyright-keep
rename to tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/copyright-keep
index 39867f52eb46..81428754fb74 100644
--- a/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/copyright-keep
+++ b/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/copyright-keep
@@ -1,2 +1,2 @@
-Copyright 2005-2013 LAMP/EPFL
 Copyright EPFL and Lightbend, Inc.
+Copyright 2005-2013 LAMP/EPFL
diff --git a/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/files-ignore b/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/files-ignore
rename to tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/files-ignore
diff --git a/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/files-keep b/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/files-keep
rename to tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.6/files-keep
diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state
index 2520b30e1b14..f01ec1bbf3ba 100644
--- a/tools/legal-review/engine/report-state
+++ b/tools/legal-review/engine/report-state
@@ -1,3 +1,3 @@
-FCCD6353934963FFEA14F9F15174BB293F81C2DAA9F2100FA72BDB5BDCFDE4D2
-D993804D291329E19020E855F2EC8B8324BA87C2DA95976A6C212C27B5BC6728
+F22125736BE5D0452B568F45CE4A76EBEF27F339469B9DD3F5476B43369DBEB3
+DBB6898C0166DF679A4179FFFADD4CD98C48D42AF072CA168FED27B41E1C3E43
 0
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-keep b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-keep
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-keep
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-ignore b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-ignore
similarity index 79%
rename from tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-ignore
rename to tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-ignore
index dd9d725708ad..1c3cacd24d28 100644
--- a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/copyright-ignore
+++ b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-ignore
@@ -1,3 +1,3 @@
 case _                      => "No copyright"
 private[scala] def versionFor(command: String) = s"Scala $command $versionString -- $copyrightString"
-val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2020, LAMP/EPFL and Lightbend, Inc.")
+val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2021, LAMP/EPFL and Lightbend, Inc.")
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-keep b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-keep
new file mode 100644
index 000000000000..34553c16ca91
--- /dev/null
+++ b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/copyright-keep
@@ -0,0 +1,2 @@
+Copyright (C) 2011 The Guava Authors
+Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/files-ignore b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/files-ignore
rename to tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/files-ignore
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/files-keep b/tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/launcher/org.scala-lang.scala-library-2.13.5/files-keep
rename to tools/legal-review/launcher/org.scala-lang.scala-library-2.13.6/files-keep
diff --git a/tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/copyright-keep b/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.scala-lang.scala-reflect-2.13.5/copyright-keep
rename to tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/copyright-keep
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/files-ignore b/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/files-ignore
rename to tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/files-ignore
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/files-keep b/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/files-keep
rename to tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.6/files-keep
diff --git a/tools/legal-review/launcher/report-state b/tools/legal-review/launcher/report-state
index 9ef07359444f..8ba469fc3fc8 100644
--- a/tools/legal-review/launcher/report-state
+++ b/tools/legal-review/launcher/report-state
@@ -1,3 +1,3 @@
-5CCE16F295F40E71EB5FAE487DAA4DA07D71DE3C86782510F1CA3779300293B3
-F7E6DEF26C72F828F3852677CABA0458FE1D683CF791DD6CA2EC42FE3CE06032
+010E85548D113CE2B15EB99BE6EBCD68C8299016FDE78AA8DB75E02BDC00E17A
+28E1F445EA0515C2F3E73ABD9DDB73395B5E0F7A84D07038A1117B782E32A1C6
 0
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-keep b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-keep
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-keep
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-ignore b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-ignore
similarity index 79%
rename from tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-ignore
rename to tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-ignore
index ae89e320fe71..1c3cacd24d28 100644
--- a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/copyright-ignore
+++ b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-ignore
@@ -1,3 +1,3 @@
-val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2020, LAMP/EPFL and Lightbend, Inc.")
-private[scala] def versionFor(command: String) = s"Scala $command $versionString -- $copyrightString"
 case _                      => "No copyright"
+private[scala] def versionFor(command: String) = s"Scala $command $versionString -- $copyrightString"
+val copyrightString       = scalaPropOrElse("copyright.string", "Copyright 2002-2021, LAMP/EPFL and Lightbend, Inc.")
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-keep b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-keep
new file mode 100644
index 000000000000..34553c16ca91
--- /dev/null
+++ b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/copyright-keep
@@ -0,0 +1,2 @@
+Copyright (C) 2011 The Guava Authors
+Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/files-ignore b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/files-ignore
rename to tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/files-ignore
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/files-keep b/tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.5/files-keep
rename to tools/legal-review/project-manager/org.scala-lang.scala-library-2.13.6/files-keep
diff --git a/tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/copyright-keep b/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.scala-lang.scala-reflect-2.13.5/copyright-keep
rename to tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/copyright-keep
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/files-ignore b/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/files-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/files-ignore
rename to tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/files-ignore
diff --git a/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/files-keep b/tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/files-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.5/files-keep
rename to tools/legal-review/project-manager/org.scala-lang.scala-reflect-2.13.6/files-keep
diff --git a/tools/legal-review/project-manager/report-state b/tools/legal-review/project-manager/report-state
index 29c1e1016fa4..1be44b6544b2 100644
--- a/tools/legal-review/project-manager/report-state
+++ b/tools/legal-review/project-manager/report-state
@@ -1,3 +1,3 @@
-55312BAC6E0F2646883D34D67754091175762157755FC1E4BFA9AD220EDEC09C
-382E2ADE0C84C56A4D4B5FC623CD85BAFC94E281D421C5BBA667A5E0F426458C
+F03FDDC24E8DABDED7AA9AB8D1459D743603CE2296A7460FEFB359BFC64ECFCD
+378F1F6DE5E96E55648F0B31C20AF99F1C9190926BE6429B0FC8BE7CAF9E6E47
 0