diff --git a/.teamcity/BuildParams.kt b/.teamcity/BuildParams.kt
index d681b16c5a1..f65357e2c45 100644
--- a/.teamcity/BuildParams.kt
+++ b/.teamcity/BuildParams.kt
@@ -2,7 +2,7 @@ object BuildParams {
   const val DOKKA_TEMPLATES_VERSION = "1.9.0-dev-218"
 
   const val KOTLINX_COROUTINES_RELEASE_TAG = "1.7.1"
-  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.0-RC"
+  const val KOTLINX_SERIALIZATION_RELEASE_TAG = "v1.6.0"
   const val KOTLINX_DATETIME_RELEASE_TAG = "v0.4.0"
   const val KOTLINX_METADATA_JVM_RELEASE_TAG = "v0.7.0"
 
diff --git a/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt b/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt
index 8417234e84d..6b05b8fb249 100644
--- a/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt
+++ b/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt
@@ -18,7 +18,7 @@ object BuildReferenceDocs : BuildType({
   """.trimIndent()
 
   params {
-    param("WEBHELP_FRONTEND_VERSION", "5.13.0")
+    param("WEBHELP_FRONTEND_VERSION", "5.15.0")
     param("WH_DOCS_PATH_REGEX", "docs")
     param("WH_PROJECT_NAME", "kotlin-reference")
   }
diff --git a/data/events.yml b/data/events.yml
index 447a12b7233..ccd85bc4d98 100644
--- a/data/events.yml
+++ b/data/events.yml
@@ -7,13 +7,13 @@
   subject : 'KKON'
   url: https://rheinwerk-kkon.de/
 - lang: en
-  startDate: '2023-11-16'
-  endDate: '2023-11-16'
+  startDate: '2023-09-21'
+  endDate: '2023-09-22'
   location: Amsterdam, Netherlands
-  speaker : 'Sebastian Aigner'
+  speaker : 'Garth Gilmour'
   title : ''
-  subject : 'Kotlin Dev Day'
-  url: https://kotlindevday.com/
+  subject : 'Kotlin Training Day'
+  url: https://pages.xebia.com/kotlin-training-day
 - lang: en
   startDate: '2023-09-14'
   endDate: '2023-09-15'
diff --git a/data/releases.yml b/data/releases.yml
index 857d80f3f92..46115006790 100644
--- a/data/releases.yml
+++ b/data/releases.yml
@@ -1,6 +1,6 @@
 url: https://github.com/JetBrains/kotlin/releases
 
 latest:
-  version: 1.9.0
-  url: https://github.com/JetBrains/kotlin/releases/tag/v1.9.0
+  version: 1.9.10
+  url: https://github.com/JetBrains/kotlin/releases/tag/v1.9.10
 
diff --git a/data/testimonials.yml b/data/testimonials.yml
index 9940a39c407..4ad78d74f3f 100644
--- a/data/testimonials.yml
+++ b/data/testimonials.yml
@@ -5,7 +5,7 @@
   url: https://www.corda.net/2017/01/10/kotlin/
   text: Corda is an open-source distributed ledger platform, supported by major banks, and built entirely in Kotlin
 - company: Evernote
-  url: https://blog.evernote.com/tech/2017/01/26/android-state-library/
+  url: https://evernote.com/blog/android-state-library/
   text: Evernote recently integrated Kotlin into their Android client
 - company: Coursera
   url: https://building.coursera.org/blog/2016/03/16/becoming-bilingual-coursera/
diff --git a/docs/images/data-science/kotlin-notebook.png b/docs/images/data-science/kotlin-notebook.png
index c9ef9827de1..f0980977064 100644
Binary files a/docs/images/data-science/kotlin-notebook.png and b/docs/images/data-science/kotlin-notebook.png differ
diff --git a/docs/images/multiplatform/multiplatform-hierarchy-completion.animated.gif b/docs/images/multiplatform/multiplatform-hierarchy-completion.animated.gif
new file mode 100644
index 00000000000..c6cd4cfef0c
Binary files /dev/null and b/docs/images/multiplatform/multiplatform-hierarchy-completion.animated.gif differ
diff --git a/docs/images/multiplatform/multiplatform-hierarchy-completion.png b/docs/images/multiplatform/multiplatform-hierarchy-completion.png
new file mode 100644
index 00000000000..9a5f253c6fe
Binary files /dev/null and b/docs/images/multiplatform/multiplatform-hierarchy-completion.png differ
diff --git a/docs/kr.tree b/docs/kr.tree
index 1a77f7b947d..62b15b40ad1 100644
--- a/docs/kr.tree
+++ b/docs/kr.tree
@@ -34,9 +34,9 @@
 
     <toc-element toc-title="What's new in Kotlin">
         <toc-element id="whatsnew19.md" toc-title="Kotlin 1.9.0" accepts-web-file-names="whatsnew.html"/>
-        <toc-element id="whatsnew1820.md" toc-title="Kotlin 1.8.20"/>
-        <toc-element id="whatsnew-eap.md" toc-title="Kotlin 1.9.0-RC" hidden="true"/>
+        <toc-element id="whatsnew-eap.md" toc-title="Kotlin 1.9.20-Beta"/>
         <toc-element toc-title="Earlier versions">
+            <toc-element id="whatsnew1820.md" toc-title="Kotlin 1.8.20"/>
             <toc-element id="whatsnew18.md" toc-title="Kotlin 1.8.0"/>
             <toc-element id="whatsnew1720.md" toc-title="Kotlin 1.7.20"/>
             <toc-element id="whatsnew17.md" toc-title="Kotlin 1.7.0"/>
@@ -394,6 +394,7 @@
         <toc-element href="https://play.kotlinlang.org/byExample/overview" toc-title="Kotlin by example"/>
         <toc-element id="koans.md"/>
         <toc-element href="https://hyperskill.org/tracks?category=4&amp;utm_source=jbkotlin_hs&amp;utm_medium=referral&amp;utm_campaign=kotlinlang-docs&amp;utm_content=button_1&amp;utm_term=22.03.23" toc-title="Kotlin Core track"/>
+        <toc-element id="kotlin-hands-on.md" toc-title="Kotlin hands-on"/>
         <toc-element id="kotlin-tips.md"/>
         <toc-element id="books.md"/>
         <toc-element id="advent-of-code.md" toc-title="Advent of Code puzzles"/>
diff --git a/docs/topics/collection-elements.md b/docs/topics/collection-elements.md
index b20fe0540e6..ad50bfa666d 100644
--- a/docs/topics/collection-elements.md
+++ b/docs/topics/collection-elements.md
@@ -130,7 +130,7 @@ It combines 2 actions:
 - Maps the collection with the selector function
 - Returns the first non-null value in the result
 
-`firstNotNullOf()` throws the `NoSuchElementException` if the resulting collection doesn't have a non-null element. 
+`firstNotNullOf()` throws the `NoSuchElementException` if the resulting collection doesn't have a non-nullable element. 
 Use the counterpart [`firstNotNullOfOrNull()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/first-not-null-of-or-null.html) 
 to return null in this case.
 
diff --git a/docs/topics/collection-filtering.md b/docs/topics/collection-filtering.md
index 057e0076b10..e64d2f4416c 100644
--- a/docs/topics/collection-filtering.md
+++ b/docs/topics/collection-filtering.md
@@ -71,8 +71,8 @@ There are also functions that narrow the element type by filtering elements of a
     {kotlin-runnable="true" kotlin-min-compiler-version="1.3"}
 
 * [`filterNotNull()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/filter-not-null.html) returns all
-    non-null elements. Being called on a `List<T?>`, `filterNotNull()` returns a `List<T: Any>`, thus allowing you to treat
-    the elements as non-null objects.
+    non-nullable elements. Being called on a `List<T?>`, `filterNotNull()` returns a `List<T: Any>`, thus allowing you to treat
+    the elements as non-nullable objects.
 
     ```kotlin
     fun main() {
diff --git a/docs/topics/competitive-programming.md b/docs/topics/competitive-programming.md
index 43bd19f37b1..f6cd1df19c3 100644
--- a/docs/topics/competitive-programming.md
+++ b/docs/topics/competitive-programming.md
@@ -104,7 +104,7 @@ Note the use of Kotlin's
 [null-assertion operator](null-safety.md#the-operator) `!!`
 after the [readLine()](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.io/read-line.html) function call.
 Kotlin's `readLine()` function is defined to return a
-[nullable type](null-safety.md#nullable-types-and-non-null-types)
+[nullable type](null-safety.md#nullable-types-and-non-nullable-types)
 `String?` and returns `null` on the end of the input, which explicitly forces the developer to handle the
 case of missing input.
 
diff --git a/docs/topics/eap.md b/docs/topics/eap.md
index 2ac0d59dfae..f2992bdfaa4 100644
--- a/docs/topics/eap.md
+++ b/docs/topics/eap.md
@@ -34,38 +34,33 @@ check [our instructions on how to configure your build to support this version](
 
 ## Build details
 
- _No preview versions are currently available._ 
+<!-- _No preview versions are currently available._ -->
 
-<!--
 <table>
     <tr>
         <th>Build info</th>
         <th>Build highlights</th>
     </tr>
     <tr>
-        <td><strong>1.9.0-RC</strong>
-            <p>Released: <strong>June 20, 2023</strong></p>
-            <p><a href="https://github.com/JetBrains/kotlin/releases/tag/v1.9.0-RC" target="_blank">Release on GitHub</a></p>
+        <td><strong>1.9.20-Beta</strong>
+            <p>Released: <strong>September 11, 2023</strong></p>
+            <p><a href="https://github.com/JetBrains/kotlin/releases/tag/v1.9.20-Beta" target="_blank">Release on GitHub</a></p>
         </td>
         <td>
              <ul>
-                 <li>Language: Stable <code>rangeUntil</code> operator, data objects, <code>Enum.entries</code> replacement for <code>Enum.values()</code>, and the <code>@Volatile</code> annotation</li>
-                 <li>K2: basic support for Kotlin/Native and multiplatform projects, support for Kotlin/JS since 1.8.20</li>
-                 <li>Kotlin/JVM: <code>@JvmDefault</code> and old <code>-Xjvm-default</code> modes deprecated with error, support for Java 20 bytecode</li>
-                 <li>Kotlin/Native: new custom memory allocator, no object initialization when accessing <code>const val</code>, partial linkage enabled by default</li>
-                 <li>Kotlin Multiplatform: new name for the <code>android</code> block, new Android source set layout enabled by default, support for Gradle configuration caching in multiplatform libraries, ability to disable sources publication in the Kotlin Multiplatform Gradle plugin, ability to add dependencies between Pods when using the CocoaPods Gradle plugin</li>
-                 <li>Kotlin/Wasm: runtime footprint reduced and performance improved, set system default browser as default for <code>wasmBrowserRun</code> task, improved JS interop, more compiler and IDE diagnostics for JS interop</li>
-                 <li>Kotlin/JS: deprecated legacy backend with error, deprecated external Enum class, extracted DOM API from standard library to module automatically added to builds, partial linkage enabled by default, IR compiler used by default, changed default destination of production distributions, deprecated <code>kotlin-js</code> Gradle plugin that is replaced by <code>kotlin-multiplatform</code> Gradle plugin, experimental support for ES6 classes and modules, reduced memory consumption for production builds</li>
-                 <li>Libraries: Stable standard library functions for open-ended ranges, new common function to get regex capture group by name, new <code>HexFormat</code> to format and parse hexadecimals, Stable time API, new path utility to create parent directories, reviewed and stabilized Kotlin/Native standard library</li>
-                 <li>Gradle: build scans show whether K1 or K2 compiler is used, new Gradle property <code>kotlin.experimental.tryK2</code> to try the K2 compiler, new project-level compiler options for Kotlin/JVM plugin, removed <code>KotlinCompile</code> task's <code>classpath</code> property, exposed <code>jvmTargetValidationMode</code> property in <code>KotlinCompile</code> task, configurable standalone mode for Kotlin/Native iOS simulator tests, removed support for <code>org.gradle.api.internal.HasConvention</code> Gradle element, added <code>optIn</code> and <code>progressiveMode</code> compiler options, compiler plugins are published separately and Gradle plugins add them as compiler arguments, kapt tasks don’t trigger eager task creation, minimum supported Android Gradle plugin version is 4.2.2</li>
+                 <li>Kotlin/JVM: support for Java 21 bytecode</li>
+                 <li>Kotlin/Native: custom allocator enabled by default, full parallel mark available in the GC, deprecated targets disabled, obligatory opt-in for all cinterop declarations (except for platform libraries), the GC scheduler tracking objects in big chunks, legacy memory manager disabled</li>
+                 <li>Kotlin Multiplatform: hierarchy template available by default, full support for Gradle Configuration cache, the default support for third-party cinterop libraries, reworked configuration of compiler settings in multiplatform projects</li>
+                 <li>Kotlin/Wasm: support for WASI, new <code>wasm-wasi</code> target and rename <code>wasm</code> target to <code>wasm-js</code>, compatible with recent updates in Wasm GC</li>
+                 <li>Kotlin/JS: using open-addressing hash map in the JS stdlib, ability to generate one JS file for each Kotlin source file</li>
+                 <li>Libraries: experimental support for <code>enumEntries()</code> function, further stabilization of Kotlin/Native standard library</li>
+                 <li>Gradle: support for Gradle versions 8.0 and 8.1, new build metrics for Kotlin/Native tasks, support for test fixtures to access internal declarations, new property to configure custom path to Konan and its dependencies</li>
             </ul>
-            <p>For more details, please refer to the <a href="https://github.com/JetBrains/kotlin/releases/tag/v1.9.0-RC">changelog</a> or <a href="whatsnew-eap.md">What's new in Kotlin 1.9.0-RC</a>.</p>
+            <p>For more details, please refer to the <a href="https://github.com/JetBrains/kotlin/releases/tag/v1.9.20-Beta">changelog</a> or <a href="whatsnew-eap.md">What's new in Kotlin 1.9.20-Beta</a>.</p>
         </td>
     </tr>
 </table>
 
 > If the Kotlin EAP plugin can't find the latest EAP build, check that you are using the latest version of [IntelliJ IDEA](https://www.jetbrains.com/help/idea/update.html) or [Android Studio](https://developer.android.com/studio/intro/update).
 >
-{type="note"}
-
--->
\ No newline at end of file
+{type="note"}
\ No newline at end of file
diff --git a/docs/topics/extensions.md b/docs/topics/extensions.md
index 7d27b46d3ba..7858cda41e3 100644
--- a/docs/topics/extensions.md
+++ b/docs/topics/extensions.md
@@ -121,7 +121,7 @@ You can call `toString()` in Kotlin without checking for `null`, as the check al
 ```kotlin
 fun Any?.toString(): String {
     if (this == null) return "null"
-    // After the null check, 'this' is autocast to a non-null type, so the toString() below
+    // After the null check, 'this' is autocast to a non-nullable type, so the toString() below
     // resolves to the member function of the Any class
     return toString()
 }
diff --git a/docs/topics/generics.md b/docs/topics/generics.md
index 8a9c60ea22c..26cb463ba54 100644
--- a/docs/topics/generics.md
+++ b/docs/topics/generics.md
@@ -85,7 +85,7 @@ In other words, the wildcard with an _extends_\-bound (_upper_ bound) makes the
 The key to understanding why this works is rather simple: if you can only _take_ items from a collection,
 then using a collection of `String`s and reading `Object`s from it is fine. Conversely, if you can only _put_ items
 into the collection, it's okay to take a collection of `Object`s and put `String`s into it: in Java there is
-`List<? super String>`, a _supertype_ of `List<Object>`.
+`List<? super String>`, which accepts `String`s or any of its supertypes.
 
 The latter is called _contravariance_, and you can only call methods that take `String` as an argument on `List<? super String>`
 (for example, you can call `add(String)` or `set(int, String)`).  If you call something that returns `T` in `List<T>`,
diff --git a/docs/topics/gradle/gradle-compilation-and-caches.md b/docs/topics/gradle/gradle-compilation-and-caches.md
index ca0a9a2eccf..26d32b10f29 100644
--- a/docs/topics/gradle/gradle-compilation-and-caches.md
+++ b/docs/topics/gradle/gradle-compilation-and-caches.md
@@ -542,5 +542,5 @@ your `gradle.properties`.
 ## What's next?
 
 Learn more about:
-* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/getting_started.html).
+* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/userguide.html).
 * [Support for Gradle plugin variants](gradle-plugin-variants.md).
\ No newline at end of file
diff --git a/docs/topics/gradle/gradle-compiler-options.md b/docs/topics/gradle/gradle-compiler-options.md
index f397117d081..7b8a54928db 100644
--- a/docs/topics/gradle/gradle-compiler-options.md
+++ b/docs/topics/gradle/gradle-compiler-options.md
@@ -59,7 +59,7 @@ For both the JVM and Android projects, it's possible to define options using the
 ```kotlin
 kotlin {
     compilerOptions {
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.%gradleApiVersion%)
     }
 }
 ```
@@ -70,7 +70,7 @@ kotlin {
 ```groovy
 kotlin {
     compilerOptions {
-        apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+        apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.%gradleApiVersion%
     }
 }
 ```
@@ -171,7 +171,7 @@ Here is a complete list of options for Gradle tasks:
 | Name                      | Description                                                                                                                                                                                                                                   | Possible values                                                                                  | Default value               |
 |---------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|-----------------------------|
 | `javaParameters`          | Generate metadata for Java 1.8 reflection on method parameters                                                                                                                                                                                |                                                                                                  | false                       |
-| `jvmTarget`               | Target version of the generated JVM bytecode                                                                                                                                                                                                  | "1.8", "9", "10", ..., "19". Also, see [Types for compiler options](#types-for-compiler-options) | "%defaultJvmTargetVersion%" |
+| `jvmTarget`               | Target version of the generated JVM bytecode                                                                                                                                                                                                  | "1.8", "9", "10", ..., "20". Also, see [Types for compiler options](#types-for-compiler-options) | "%defaultJvmTargetVersion%" |
 | `noJdk`                   | Don't automatically include the Java runtime into the classpath                                                                                                                                                                               |                                                                                                  | false                       |
 | `jvmTargetValidationMode` | <list><li>Validation of the [JVM target compatibility](gradle-configure-project.md#check-for-jvm-target-compatibility-of-related-compile-tasks) between Kotlin and Java</li><li>A property for tasks of the `KotlinCompile` type.</li></list> | `WARNING`, `ERROR`, `INFO`                                                                       | `ERROR`                     |
 
@@ -237,8 +237,8 @@ tasks.named('compileKotlin', KotlinCompilationTask) {
 
 | Name | Description | Possible values |Default value |
 |------|-------------|-----------------|--------------|
-| `apiVersion` | Restrict the use of declarations to those from the specified version of bundled libraries | "1.3" (DEPRECATED), "1.4" (DEPRECATED), "1.5", "1.6", "1.7", "1.8", "1.9" (EXPERIMENTAL) |  |
-| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.3" (DEPRECATED), "1.4" (DEPRECATED), "1.5", "1.6", "1.7", "1.8", "1.9" (EXPERIMENTAL) |  |
+| `apiVersion` | Restrict the use of declarations to those from the specified version of bundled libraries | "1.4" (DEPRECATED), "1.5" (DEPRECATED), "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) |  |
+| `languageVersion` | Provide source compatibility with the specified version of Kotlin | "1.4" (DEPRECATED), "1.5" (DEPRECATED), "1.6", "1.7", "1.8", "1.9", "2.0" (EXPERIMENTAL), "2.1" (EXPERIMENTAL) |  |
 
 #### Example of setting a languageVersion
 
@@ -254,7 +254,7 @@ tasks
         compilerOptions
             .languageVersion
             .set(
-              org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+              org.jetbrains.kotlin.gradle.dsl.KotlinVersion.%gradleLanguageVersion%
             )
     }
 ```
@@ -267,7 +267,7 @@ tasks
     .withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class)
     .configureEach {
         compilerOptions.languageVersion = 
-                org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+                org.jetbrains.kotlin.gradle.dsl.KotlinVersion.%gradleLanguageVersion%
 }
 ```
 
@@ -299,7 +299,7 @@ Some of the `compilerOptions` use the new types instead of the `String` type:
 | Option | Type | Example |
 |--------|------|---------|
 | `jvmTarget` | [`JvmTarget`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt) | `compilerOptions.jvmTarget.set(JvmTarget.JVM_11)` |
-| `apiVersion` and `languageVersion` | [`KotlinVersion`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt) | `compilerOptions.languageVersion.set(KotlinVersion.KOTLIN_1_9)` |
+| `apiVersion` and `languageVersion` | [`KotlinVersion`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt) | `compilerOptions.languageVersion.set(KotlinVersion.%gradleLanguageVersion%)` |
 | `main` | [`JsMainFunctionExecutionMode`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode.kt) | `compilerOptions.main.set(JsMainFunctionExecutionMode.NO_CALL)` |
 | `moduleKind` | [`JsModuleKind`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsModuleKind.kt) | `compilerOptions.moduleKind.set(JsModuleKind.MODULE_ES)` |
 | `sourceMapEmbedSources` | [`JsSourceMapEmbedMode`](https://github.com/JetBrains/kotlin/blob/1.8.0/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode.kt) | `compilerOptions.sourceMapEmbedSources.set(JsSourceMapEmbedMode.SOURCE_MAP_SOURCE_CONTENT_INLINING)` |
@@ -309,5 +309,5 @@ Some of the `compilerOptions` use the new types instead of the `String` type:
 
 Learn more about:
 * [Incremental compilation, caches support, build reports, and the Kotlin daemon](gradle-compilation-and-caches.md).
-* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/getting_started.html).
+* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/userguide.html).
 * [Support for Gradle plugin variants](gradle-plugin-variants.md).
\ No newline at end of file
diff --git a/docs/topics/gradle/gradle-configure-project.md b/docs/topics/gradle/gradle-configure-project.md
index dc599786a3a..ccc64f9129b 100644
--- a/docs/topics/gradle/gradle-configure-project.md
+++ b/docs/topics/gradle/gradle-configure-project.md
@@ -1,6 +1,6 @@
 [//]: # (title: Configure a Gradle project)
 
-To build a Kotlin project with [Gradle](https://docs.gradle.org/current/userguide/getting_started.html), 
+To build a Kotlin project with [Gradle](https://docs.gradle.org/current/userguide/userguide.html), 
 you need to add the [Kotlin Gradle plugin](#apply-the-plugin) to your build script file `build.gradle(.kts)` 
 and [configure the project's dependencies](#configure-dependencies) there.
 
@@ -1150,5 +1150,5 @@ dependencies {
 Learn more about:
 * [Compiler options and how to pass them](gradle-compiler-options.md).
 * [Incremental compilation, caches support, build reports, and the Kotlin daemon](gradle-compilation-and-caches.md).
-* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/getting_started.html).
+* [Gradle basics and specifics](https://docs.gradle.org/current/userguide/userguide.html).
 * [Support for Gradle plugin variants](gradle-plugin-variants.md).
diff --git a/docs/topics/gradle/gradle-plugin-variants.md b/docs/topics/gradle/gradle-plugin-variants.md
index 7b408bea4f4..c5f39e10f64 100644
--- a/docs/topics/gradle/gradle-plugin-variants.md
+++ b/docs/topics/gradle/gradle-plugin-variants.md
@@ -156,4 +156,4 @@ Otherwise, you will receive an error similar to this:
 
 ## What's next?
 
-Learn more about [Gradle basics and specifics](https://docs.gradle.org/current/userguide/getting_started.html).
+Learn more about [Gradle basics and specifics](https://docs.gradle.org/current/userguide/userguide.html).
diff --git a/docs/topics/gradle/gradle.md b/docs/topics/gradle/gradle.md
index 5f3a5b2e755..6819a32162b 100644
--- a/docs/topics/gradle/gradle.md
+++ b/docs/topics/gradle/gradle.md
@@ -2,7 +2,7 @@
 
 Gradle is a build system that helps to automate and manage your building process. It downloads required dependencies,
 packages your code, and prepares it for compilation. Learn about Gradle basics and specifics 
-on the [Gradle website](https://docs.gradle.org/current/userguide/getting_started.html).
+on the [Gradle website](https://docs.gradle.org/current/userguide/userguide.html).
 
 You can set up your own project with [these instructions](gradle-configure-project.md) for different platforms 
 or pass a small [step-by-step tutorial](get-started-with-jvm-gradle-project.md) that will show you how to create a simple backend 
diff --git a/docs/topics/home.xml b/docs/topics/home.xml
index 2480bb3bc75..5c0905bda92 100644
--- a/docs/topics/home.xml
+++ b/docs/topics/home.xml
@@ -28,7 +28,7 @@
             <a href="coding-conventions.md" description="Recommendations on the code organization, formatting, and naming">Coding conventions</a>
             <a href="basic-types.md" description="Kotlin type system: numbers, strings, arrays, and other built-in types">Basic types</a>
             <a href="control-flow.md" description="Conditions and loops: if, when, for, while">Control flow</a>
-            <a href="null-safety.md" description="Nullable and non-null types, elvis operator, safe calls and casts ">Null safety</a>
+            <a href="null-safety.md" description="Nullable and non-nullable types, elvis operator, safe calls and casts ">Null safety</a>
             <a href="coroutines-overview.md" description="Concurrency: coroutines, flows, channels">Coroutines</a>
         </highlighted-group>
         <custom-groups>
@@ -50,7 +50,7 @@
                     <a href="koans.md" description="Programming exercises to get you familiar with Kotlin">Koans</a>
                     <a href="https://hyperskill.org/tracks?category=4&amp;utm_source=jbkotlin_hs&amp;utm_medium=referral&amp;utm_campaign=kotlinlang-docs&amp;utm_content=button_1&amp;utm_term=22.03.23" description="Kotlin Core track by JetBrains Academy">JetBrains Academy</a>
                     <a href="advent-of-code.md" description="Code puzzles in idiomatic Kotlin">Advent of Code</a>
-                    <a href="https://play.kotlinlang.org/hands-on/overview" description="Complete long-form tutorials to fully grasp a technology">Hands-on tutorials</a>
+                    <a href="kotlin-hands-on.md" description="Complete long-form tutorials to fully grasp a technology">Hands-on tutorials</a>
                     <a href="edu-tools-learner.md"
                        description="An IDE plugin for learning and teaching programming languages">JetBrains Academy in
                         IntelliJ IDEA</a>
diff --git a/docs/topics/js/js-ir-compiler.md b/docs/topics/js/js-ir-compiler.md
index 36a342e3b1b..91f5eca383a 100644
--- a/docs/topics/js/js-ir-compiler.md
+++ b/docs/topics/js/js-ir-compiler.md
@@ -26,7 +26,7 @@ kotlin {
 * `LEGACY` uses the old compiler backend.
 * `BOTH` compiles your project with the new IR compiler as well as the default compiler backend. Use this mode for [authoring libraries compatible with both backends](#authoring-libraries-for-the-ir-compiler-with-backwards-compatibility).
 
-> The old compiler backend has been deprecated since Kotlin 1.8.0. Starting with Kotlin 1.9.0, using compiler types `LEGACY` of `BOTH` leads to an error.
+> The old compiler backend has been deprecated since Kotlin 1.8.0. Starting with Kotlin 1.9.0, using compiler types `LEGACY` or `BOTH` leads to an error.
 >
 {type="warning"}
 
diff --git a/docs/topics/js/js-react.md b/docs/topics/js/js-react.md
index 72a920c3002..38e20396326 100644
--- a/docs/topics/js/js-react.md
+++ b/docs/topics/js/js-react.md
@@ -742,7 +742,7 @@ in each `Video` object, so you can pass it as a prop and access its attributes.
    }
    ```
 
-2. Because the `VideoPlayerProps` interface specifies that the `VideoPlayer` component takes a non-null `Video`, make
+2. Because the `VideoPlayerProps` interface specifies that the `VideoPlayer` component takes a non-nullable `Video`, make
    sure to handle this in the `App` component accordingly.
 
    In `App.kt`, replace the previous `div` snippet for the video player with the following:
diff --git a/docs/topics/jvm/java-interop.md b/docs/topics/jvm/java-interop.md
index 83b0c3e5f56..ee1a7b6991d 100644
--- a/docs/topics/jvm/java-interop.md
+++ b/docs/topics/jvm/java-interop.md
@@ -171,14 +171,14 @@ item.substring(1) // allowed, throws an exception if item == null
 
 Platform types are *non-denotable*, meaning that you can't write them down explicitly in the language.
 When a platform value is assigned to a Kotlin variable, you can rely on the type inference (the variable will have an inferred
-platform type then, as `item` has in the example above), or you can choose the type you expect (both nullable and non-null types are allowed):
+platform type then, as `item` has in the example above), or you can choose the type you expect (both nullable and non-nullable types are allowed):
 
 ```kotlin
 val nullable: String? = item // allowed, always works
 val notNull: String = item // allowed, may fail at runtime
 ```
 
-If you choose a non-null type, the compiler will emit an assertion upon assignment. This prevents Kotlin's non-null variables from holding
+If you choose a non-nullable type, the compiler will emit an assertion upon assignment. This prevents Kotlin's non-nullable variables from holding
 nulls. Assertions are also emitted when you pass platform values to Kotlin functions expecting non-null values and in other cases.
 Overall, the compiler does its best to prevent nulls from propagating far through the program although sometimes this is
 impossible to eliminate entirely, because of generics.
@@ -195,7 +195,7 @@ so there is a mnemonic notation for them:
 
 ### Nullability annotations
 
-Java types that have nullability annotations are represented not as platform types, but as actual nullable or non-null
+Java types that have nullability annotations are represented not as platform types, but as actual nullable or non-nullable
 Kotlin types. The compiler supports several flavors of nullability annotations, including:
 
   * [JetBrains](https://www.jetbrains.com/idea/help/nullable-and-notnull-annotations.html)
@@ -320,7 +320,7 @@ nullability which deviates from the nullability annotations from Java.
 The [`@Nonnull`](https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/latest/javax/annotation/Nonnull.html) annotation defined
 in [JSR-305](https://jcp.org/en/jsr/detail?id=305) is supported for denoting nullability of Java types.
 
-If the `@Nonnull(when = ...)` value is `When.ALWAYS`, the annotated type is treated as non-null; `When.MAYBE` and
+If the `@Nonnull(when = ...)` value is `When.ALWAYS`, the annotated type is treated as non-nullable; `When.MAYBE` and
 `When.NEVER` denote a nullable type; and `When.UNKNOWN` forces the type to be [platform one](#null-safety-and-platform-types).
 
 A library can be compiled against the JSR-305 annotations, but there's no need to make the annotations artifact (e.g. `jsr305.jar`)
@@ -406,7 +406,7 @@ interface A {
 ```
 
 > The types in this example only take place with the strict mode enabled; otherwise, the platform types remain.
->See the [`@UnderMigration` annotation](#undermigration-annotation) and [Compiler configuration](#compiler-configuration) sections.
+> See the [`@UnderMigration` annotation](#undermigration-annotation) and [Compiler configuration](#compiler-configuration) sections.
 >
 {type="note"}
 
@@ -441,14 +441,14 @@ A library maintainer can add `@UnderMigration` status to both type qualifier nic
 public @interface NonNullApi {
 }
 
-// The types in the class are non-null, but only warnings are reported
+// The types in the class are non-nullable, but only warnings are reported
 // because `@NonNullApi` is annotated `@UnderMigration(status = MigrationStatus.WARN)`
 @NonNullApi
 public class Test {}
 ```
 
->The migration status of a nullability annotation is not inherited by its type qualifier nicknames but is applied
->to its usages in default type qualifiers.
+> The migration status of a nullability annotation is not inherited by its type qualifier nicknames but is applied
+> to its usages in default type qualifiers.
 >
 {type="note"}
 
diff --git a/docs/topics/jvm/java-to-kotlin-interop.md b/docs/topics/jvm/java-to-kotlin-interop.md
index 1e23881c797..0f01e7dd1f0 100644
--- a/docs/topics/jvm/java-to-kotlin-interop.md
+++ b/docs/topics/jvm/java-to-kotlin-interop.md
@@ -529,7 +529,7 @@ fun writeToFile() {
 
 ## Null-safety
 
-When calling Kotlin functions from Java, nobody prevents us from passing `null` as a non-null parameter.
+When calling Kotlin functions from Java, nobody prevents us from passing `null` as a non-nullable parameter.
 That's why Kotlin generates runtime checks for all public functions that expect non-nulls.
 This way we get a `NullPointerException` in the Java code immediately.
 
diff --git a/docs/topics/jvm/java-to-kotlin-nullability-guide.md b/docs/topics/jvm/java-to-kotlin-nullability-guide.md
index 743e9dc9e9a..d69894cb0a0 100644
--- a/docs/topics/jvm/java-to-kotlin-nullability-guide.md
+++ b/docs/topics/jvm/java-to-kotlin-nullability-guide.md
@@ -85,7 +85,7 @@ After the check is passed successfully, the compiler treats the variable as if i
 in the scope where the compiler performs the check.
 
 If you don't perform this check, the code will fail to compile with the following message:
-"Only [safe (?.)](null-safety.md#safe-calls) or [non-null asserted (!!.) calls](null-safety.md#the-operator) are allowed
+"Only [safe (?.)](null-safety.md#safe-calls) or [non-nullable asserted (!!.) calls](null-safety.md#the-operator) are allowed
 on a [nullable receiver](extensions.md#nullable-receiver) of type String?".
 
 You can write the same shorter – use the [safe-call operator ?. (If-not-null shorthand)](idioms.md#if-not-null-shorthand), 
diff --git a/docs/topics/jvm/jvm-spring-boot-add-data-class.md b/docs/topics/jvm/jvm-spring-boot-add-data-class.md
index 818dd7deb90..4f7eb6dfbcf 100644
--- a/docs/topics/jvm/jvm-spring-boot-add-data-class.md
+++ b/docs/topics/jvm/jvm-spring-boot-add-data-class.md
@@ -36,7 +36,7 @@ It requires changing the `MessageController` class to respond with a JSON docume
           </p>
        </def>
        <def title="Nullable types – String?">
-          <p>Kotlin provides <a href="null-safety.md#nullable-types-and-non-null-types">built-in support for nullable types</a>. In Kotlin, the type system distinguishes between references that can hold <code>null</code> (<i>nullable references</i>) and those that cannot (<i>non-nullable references</i>).<br/>
+          <p>Kotlin provides <a href="null-safety.md#nullable-types-and-non-nullable-types">built-in support for nullable types</a>. In Kotlin, the type system distinguishes between references that can hold <code>null</code> (<i>nullable references</i>) and those that cannot (<i>non-nullable references</i>).<br/>
           For example, a regular variable of type <code>String</code> cannot hold <code>null</code>. To allow nulls, you can declare a variable as a nullable string by writing <code>String?</code>.
           </p>
           <p>The <code>id</code> property of the <code>Message</code> class is declared as a nullable type this time.
diff --git a/docs/topics/keyword-reference.md b/docs/topics/keyword-reference.md
index 8d0d7a6fd06..625dbd9e62c 100644
--- a/docs/topics/keyword-reference.md
+++ b/docs/topics/keyword-reference.md
@@ -104,7 +104,7 @@ in other contexts:
  * `inline` tells the compiler to [inline a function and the lambdas passed to it at the call site](inline-functions.md).
  * `inner` allows referring to an outer class instance from a [nested class](nested-classes.md).
  * `internal` marks a declaration as [visible in the current module](visibility-modifiers.md).
- * `lateinit` allows initializing a [non-null property outside of a constructor](properties.md#late-initialized-properties-and-variables).
+ * `lateinit` allows initializing a [non-nullable property outside of a constructor](properties.md#late-initialized-properties-and-variables).
  * `noinline` turns off [inlining of a lambda passed to an inline function](inline-functions.md#noinline).
  * `open` allows [subclassing a class or overriding a member](classes.md#inheritance).
  * `operator` marks a function as [overloading an operator or implementing a convention](operator-overloading.md).
@@ -143,13 +143,13 @@ Kotlin supports the following operators and special symbols:
  * `===`, `!==` - [referential equality operators](equality.md#referential-equality).
  * `<`, `>`, `<=`, `>=` - [comparison operators](operator-overloading.md#comparison-operators) (translated to calls of `compareTo()` for non-primitive types).
  * `[`, `]` - [indexed access operator](operator-overloading.md#indexed-access-operator) (translated to calls of `get` and `set`).
- * `!!` [asserts that an expression is non-null](null-safety.md#the-operator).
- * `?.` performs a [safe call](null-safety.md#safe-calls) (calls a method or accesses a property if the receiver is non-null).
+ * `!!` [asserts that an expression is non-nullable](null-safety.md#the-operator).
+ * `?.` performs a [safe call](null-safety.md#safe-calls) (calls a method or accesses a property if the receiver is non-nullable).
  * `?:` takes the right-hand value if the left-hand value is null (the [elvis operator](null-safety.md#elvis-operator)).
  * `::` creates a [member reference](reflection.md#function-references) or a [class reference](reflection.md#class-references).
  * `..`, `..<` create [ranges](ranges.md).
  * `:` separates a name from a type in a declaration.
- * `?` marks a type as [nullable](null-safety.md#nullable-types-and-non-null-types).
+ * `?` marks a type as [nullable](null-safety.md#nullable-types-and-non-nullable-types).
  * `->`
      - separates the parameters and body of a [lambda expression](lambdas.md#lambda-expression-syntax).
      - separates the parameters and return type declaration in a [function type](lambdas.md#function-types).
diff --git a/docs/topics/kotlin-evolution.md b/docs/topics/kotlin-evolution.md
index 8c0c677c3e3..564ae5c4c08 100644
--- a/docs/topics/kotlin-evolution.md
+++ b/docs/topics/kotlin-evolution.md
@@ -73,7 +73,7 @@ Compilers are complicated software and despite the best effort of their develope
 [JetBrains](https://jetbrains.com), the original creator of Kotlin, is driving its progress with the help of the community and in accord with the [Kotlin Foundation](https://kotlinfoundation.org/).
 
 All changes to the Kotlin Programming Language are overseen by the [Lead Language Designer](https://kotlinfoundation.org/structure/) (currently Roman Elizarov). The Lead Designer has the final say in all matters related to language evolution. Additionally, incompatible changes to fully stable components have to be approved to by the [Language Committee](https://kotlinfoundation.org/structure/) designated 
-under the [Kotlin Foundation](https://kotlinfoundation.org/structure/) (currently comprised of Jeffrey van Gogh, William R. Cook and Roman Elizarov).
+under the [Kotlin Foundation](https://kotlinfoundation.org/structure/) (currently comprised of Jeffrey van Gogh, Werner Dietl, and Roman Elizarov).
 
 The Language Committee makes final decisions on what incompatible changes will be made and what exact measures should be taken to make user updates comfortable. In doing so, it relies on a set of guidelines available [here](https://kotlinfoundation.org/language-committee-guidelines/).
 
diff --git a/docs/topics/kotlin-hands-on.md b/docs/topics/kotlin-hands-on.md
new file mode 100644
index 00000000000..4b1308eeae7
--- /dev/null
+++ b/docs/topics/kotlin-hands-on.md
@@ -0,0 +1,76 @@
+[//]: # (title: Kotlin hands-on)
+
+A series of hands-on tutorials where you can create applications with Kotlin using a variety of different technologies and targeting multiple platforms.
+The exercises are divided into a series of steps, walking you through each section.
+
+## Building Reactive Spring Boot applications with Kotlin coroutines and RSocket
+
+Build a simple chat application using Spring Boot and Kotlin, and learn about the benefits of using Kotlin for server-side development from a syntax perspective.
+
+[**Start**](https://spring.io/guides/tutorials/spring-webflux-kotlin-rsocket/)
+
+## Building web applications with React and Kotlin/JS
+
+Create a React Application using Kotlin/JS, and see how you can leverage Kotlin's type system, library ecosystem, and interoperability features.
+
+[**Start**](js-react.md)
+
+## Building web applications with Spring Boot and Kotlin
+
+Build a sample blog application by combining the power of Spring Boot and Kotlin.
+
+[**Start**](https://spring.io/guides/tutorials/spring-boot-kotlin/)
+
+## Creating HTTP APIs with Ktor
+
+Create a backend API for your application that responds to HTTP requests.
+
+[**Start**](https://ktor.io/docs/creating-http-apis.html)
+
+## Creating a WebSocket chat with Ktor
+
+Create a simple Chat application using Ktor including both a JVM server and a JVM client.
+
+[**Start**](https://ktor.io/docs/creating-web-socket-chat.html)
+
+## Creating an interactive website with Ktor
+
+Learn how to serve files, use templating engines such as Freemarker and the kotlinx.html DSL, and work with form input from Ktor.
+
+[**Start**](https://ktor.io/docs/creating-interactive-website.html)
+
+## Building a full stack web app with Kotlin Multiplatform
+
+Create an application with Kotlin/JVM and Kotlin/JS, and explore topics around code sharing, serialization, server- and client-side development.
+
+[**Start**](multiplatform-full-stack-app.md)
+
+## Introduction to Kotlin coroutines and channels
+
+Learn about coroutines in Kotlin and how you can communicate between them using channels.
+
+[**Start**](coroutines-and-channels.md)
+
+## Introduction to Kotlin/Native
+
+Create a simple HTTP client that can run natively on multiple platforms using Kotlin/Native and libcurl.
+
+[**Start**](native-app-with-c-and-libcurl.md)
+
+## Introduction to Kotlin/Native concurrency
+
+Learn about the concurrency model in Kotlin/Native, and how to work with state in a multithreaded environment.
+
+[**Start**](multiplatform-mobile-concurrency-overview.md)
+
+## Kotlin Multiplatform: networking and data storage
+
+Learn how to create a mobile application for Android and iOS using Kotlin Multiplatform with Ktor and SQLDelight.
+
+[**Start**](multiplatform-mobile-ktor-sqldelight.md)
+
+## Targeting iOS and Android with Kotlin Multiplatform
+
+Learn how to create a mobile application that can target both iOS and Android using Kotlin Multiplatform.
+
+[**Start**](multiplatform-mobile-create-first-app.md)
\ No newline at end of file
diff --git a/docs/topics/ksp/ksp-overview.md b/docs/topics/ksp/ksp-overview.md
index 442a1f4b879..5a21f9caa37 100644
--- a/docs/topics/ksp/ksp-overview.md
+++ b/docs/topics/ksp/ksp-overview.md
@@ -2,10 +2,10 @@
 
 Kotlin Symbol Processing (_KSP_) is an API that you can use to develop lightweight compiler plugins.
 KSP provides a simplified compiler plugin API that leverages the power of Kotlin while keeping the learning curve at
-a minimum. Compared to [kapt](kapt.md), annotation processors that use KSP can run up to 2 times faster.
+a minimum. Compared to [kapt](kapt.md), annotation processors that use KSP can run up to two times faster.
 
-To learn more about how KSP compares to kapt, check out [why KSP](ksp-why-ksp.md).
-To get started writing a KSP processor, take a look at the [KSP quickstart](ksp-quickstart.md).
+* To learn more about how KSP compares to kapt, check out [why KSP](ksp-why-ksp.md).
+* To get started writing a KSP processor, take a look at the [KSP quickstart](ksp-quickstart.md).
 
 ## Overview
 
@@ -157,26 +157,26 @@ class HelloFunctionFinderProcessor : SymbolProcessor() {
 
 ## Supported libraries
 
-The table below includes a list of popular libraries on Android and their various stages of support for KSP.
-
-|Library|Status|Tracking issue for KSP|
-|---|---|---|
-|Room|[Officially supported](https://developer.android.com/jetpack/androidx/releases/room#2.3.0-beta02)|   |
-|Moshi|[Officially supported](https://github.com/square/moshi/)|   |
-|RxHttp|[Officially supported](https://github.com/liujingxing/rxhttp)|   |
-|Kotshi|[Officially supported](https://github.com/ansman/kotshi)|   |
-|Lyricist|[Officially supported](https://github.com/adrielcafe/lyricist)|   |
-|Lich SavedState|[Officially supported](https://github.com/line/lich/tree/master/savedstate)|   |
-|gRPC Dekorator|[Officially supported](https://github.com/mottljan/grpc-dekorator)|   |
-|EasyAdapter|[Officially supported](https://github.com/AmrDeveloper/EasyAdapter)|   |
-|Koin Annotations|[Officially supported](https://github.com/InsertKoinIO/koin-annotations)|   |
-|Auto Factory|Not yet supported|[Link](https://github.com/google/auto/issues/982)|
-|Dagger|Not yet supported|[Link](https://github.com/google/dagger/issues/2349)|
-|Hilt|Not yet supported|[Link](https://issuetracker.google.com/179057202)|
-|Glide|[Officially supported](https://github.com/bumptech/glide)|   |
-|DeeplinkDispatch|[Supported via airbnb/DeepLinkDispatch#323](https://github.com/airbnb/DeepLinkDispatch/pull/323)| |
-|Micronaut|In Progress|[Link](https://github.com/micronaut-projects/micronaut-core/issues/6781)|
-|Epoxy|[Officially supported](https://github.com/airbnb/epoxy)||
-|Paris|[Officially supported](https://github.com/airbnb/paris)||
-|Auto Dagger|[Officially supported](https://github.com/ansman/auto-dagger)||
-|SealedX|[Officially supported](https://github.com/skydoves/sealedx)||
+The table includes a list of popular libraries on Android and their various stages of support for KSP:
+
+|Library|Status|
+|---|---|
+|Room|[Officially supported](https://developer.android.com/jetpack/androidx/releases/room#2.3.0-beta02)|
+|Moshi|[Officially supported](https://github.com/square/moshi/)|
+|RxHttp|[Officially supported](https://github.com/liujingxing/rxhttp)|
+|Kotshi|[Officially supported](https://github.com/ansman/kotshi)|
+|Lyricist|[Officially supported](https://github.com/adrielcafe/lyricist)|
+|Lich SavedState|[Officially supported](https://github.com/line/lich/tree/master/savedstate)|
+|gRPC Dekorator|[Officially supported](https://github.com/mottljan/grpc-dekorator)|
+|EasyAdapter|[Officially supported](https://github.com/AmrDeveloper/EasyAdapter)|
+|Koin Annotations|[Officially supported](https://github.com/InsertKoinIO/koin-annotations)|
+|Glide|[Officially supported](https://github.com/bumptech/glide)| 
+|Micronaut|[Officially supported](https://micronaut.io/2023/07/14/micronaut-framework-4-0-0-released/)|
+|Epoxy|[Officially supported](https://github.com/airbnb/epoxy)|
+|Paris|[Officially supported](https://github.com/airbnb/paris)|
+|Auto Dagger|[Officially supported](https://github.com/ansman/auto-dagger)|
+|SealedX|[Officially supported](https://github.com/skydoves/sealedx)|
+|DeeplinkDispatch|[Supported via airbnb/DeepLinkDispatch#323](https://github.com/airbnb/DeepLinkDispatch/pull/323)|
+|Dagger|[Alpha](https://dagger.dev/dev-guide/ksp)|
+|Hilt|[In progress](https://dagger.dev/dev-guide/ksp)|
+|Auto Factory|[Not yet supported](https://github.com/google/auto/issues/982)|
diff --git a/docs/topics/lambdas.md b/docs/topics/lambdas.md
index ec630e536de..8580d6458c3 100644
--- a/docs/topics/lambdas.md
+++ b/docs/topics/lambdas.md
@@ -88,7 +88,7 @@ These types have a special notation that corresponds to the signatures of the fu
 The function type notation can optionally include names for the function parameters: `(x: Int, y: Int) -> Point`.
 These names can be used for documenting the meaning of the parameters.
 
-To specify that a function type is [nullable](null-safety.md#nullable-types-and-non-null-types), use parentheses as follows:
+To specify that a function type is [nullable](null-safety.md#nullable-types-and-non-nullable-types), use parentheses as follows:
 `((Int, Int) -> Int)?`.
 
 Function types can also be combined using parentheses: `(Int) -> ((Int) -> Unit)`.
diff --git a/docs/topics/learning-materials-overview.md b/docs/topics/learning-materials-overview.md
index 6c6d38c6763..2e6716cb2ff 100644
--- a/docs/topics/learning-materials-overview.md
+++ b/docs/topics/learning-materials-overview.md
@@ -12,6 +12,6 @@ You can use the following materials and resources for learning Kotlin:
 * [Kotlin books](books.md) – find books we've reviewed and recommend for learning Kotlin.
 * [Kotlin tips](kotlin-tips.md) – watch short videos where the Kotlin team shows you how to use Kotlin in a more efficient and idiomatic way, so you can have more fun when writing code.
 * [Advent of Code puzzles](advent-of-code.md) – learn idiomatic Kotlin and test your language skills by completing short and fun tasks.
-* [Kotlin hands-on tutorials](https://play.kotlinlang.org/hands-on/overview) – complete long-form tutorials to fully grasp a technology. These tutorials guide you through a self-contained project related to a specific topic.
+* [Kotlin hands-on tutorials](kotlin-hands-on.md) – complete long-form tutorials to fully grasp a technology. These tutorials guide you through a self-contained project related to a specific topic.
 * [Kotlin for Java Developers](https://www.coursera.org/learn/kotlin-for-java-developers) – learn the similarities and differences between Java and Kotlin in this course on Coursera.
 * [Kotlin documentation in PDF format](kotlin-pdf.md) – read our documentation offline.
diff --git a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-and-coroutines.md b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-and-coroutines.md
index a2c9dbe2911..e02d7f3c7d4 100644
--- a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-and-coroutines.md
+++ b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-and-coroutines.md
@@ -3,7 +3,9 @@
 > This page describes the features of the legacy memory manager. Check out [Kotlin/Native memory management](native-memory-manager.md)
 > to learn about the new memory manager, which has been enabled by default since Kotlin 1.7.20.
 >
-{type="note"}
+> For more information on the concurrent programming in Kotlin, see the [Coroutines guide](coroutines-guide.md).
+>
+{type="warning"}
 
 When working with mobile platforms, you may need to write multithreaded code that runs in parallel. For this, 
 you can use the [standard](#coroutines) `kotlinx.coroutines` library or its [multithreaded version](#multithreaded-coroutines) 
diff --git a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-overview.md b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-overview.md
index c87abad4711..458f0d0df27 100644
--- a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-overview.md
+++ b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrency-overview.md
@@ -3,7 +3,9 @@
 > This page describes the features of the legacy memory manager. Check out [Kotlin/Native memory management](native-memory-manager.md)
 > to learn about the new memory manager, which has been enabled by default since Kotlin 1.7.20.
 >
-{type="note"}
+> For more information on the concurrent programming in Kotlin, see the [Coroutines guide](coroutines-guide.md).
+>
+{type="warning"}
 
 When you extend your development experience from Android to Kotlin Multiplatform for mobile, you will encounter a different state 
 and concurrency model for iOS. This is a Kotlin/Native model that compiles Kotlin code to native binaries that can run without a virtual machine, for example on iOS. 
diff --git a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrent-mutability.md b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrent-mutability.md
index 53d9a9550cf..83917d6289d 100644
--- a/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrent-mutability.md
+++ b/docs/topics/multiplatform-mobile/multiplatform-mobile-concurrent-mutability.md
@@ -3,7 +3,9 @@
 > This page describes the features of the legacy memory manager. Check out [Kotlin/Native memory management](native-memory-manager.md)
 > to learn about the new memory manager, which has been enabled by default since Kotlin 1.7.20.
 >
-{type="note"}
+> For more information on the concurrent programming in Kotlin, see the [Coroutines guide](coroutines-guide.md).
+>
+{type="warning"}
 
 When it comes to working with iOS, [Kotlin/Native's state and concurrency model](multiplatform-mobile-concurrency-overview.md) has [two simple rules](multiplatform-mobile-concurrency-overview.md#rules-for-state-sharing).
 
diff --git a/docs/topics/multiplatform-mobile/multiplatform-mobile-samples.md b/docs/topics/multiplatform-mobile/multiplatform-mobile-samples.md
index ed6f482ecbc..36a47596814 100644
--- a/docs/topics/multiplatform-mobile/multiplatform-mobile-samples.md
+++ b/docs/topics/multiplatform-mobile/multiplatform-mobile-samples.md
@@ -70,7 +70,7 @@ This is a curated list of cross-platform mobile projects created with Kotlin Mul
     </td>
   </tr>
   <tr>
-    <td><strong><a href="https://github.com/JetBrains/compose-jb/tree/master/examples/todoapp">todoapp</a></strong></td>
+    <td><strong><a href="https://github.com/IlyaGulya/TodoAppDecomposeMviKotlin">TodoAppDecomposeMviKotlin</a></strong></td>
     <td>Models, Networking, Presentation, Navigation and UI </td>
     <td>SQLDelight, Decompose, MVIKotlin, Reaktive</td>
     <td>Jetpack Compose, SwiftUI</td>
@@ -177,7 +177,7 @@ This is a curated list of cross-platform mobile projects created with Kotlin Mul
     <td>-</td>
     <td>
       <list>
-        <li> Uses <a href="https://realm.io/">Realm</a> for data persistence </li>
+        <li> Uses <a href="https://www.mongodb.com/docs/realm/sdk/kotlin/">Realm</a> for data persistence </li>
       </list>
     </td>
   </tr>
diff --git a/docs/topics/multiplatform-mobile/multiplatform-mobile-understand-project-structure.md b/docs/topics/multiplatform-mobile/multiplatform-mobile-understand-project-structure.md
index 2d9644dc67c..1b3cda4d5ab 100644
--- a/docs/topics/multiplatform-mobile/multiplatform-mobile-understand-project-structure.md
+++ b/docs/topics/multiplatform-mobile/multiplatform-mobile-understand-project-structure.md
@@ -159,7 +159,7 @@ Read [Multiplatform documentation on adding dependencies](multiplatform-add-depe
 Along with `*Main` source sets, there are three matching test source sets:
 
 * `commonTest`
-* `androidTest`
+* `androidUnitTest`
 * `iosTest`
 
 Use them to store unit tests for common and platform-specific source sets accordingly.
@@ -178,7 +178,7 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val androidTest by getting
+        val androidUnitTest by getting
         val iosTest by getting
     }
 
@@ -198,7 +198,7 @@ kotlin {
                 implementation kotlin('test')
             }
         }
-        androidTest {
+        androidUnitTest {
 
         }
         iosTest {
@@ -253,11 +253,12 @@ The configuration of Android library is stored in the `android {}` top-level blo
 
 ```kotlin
 android {
-    compileSdk = 29
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    // A typical Android configuration, see https://developer.android.com/build for details.
+    //  For example:
+    namespace = "com.example.kotlinmultiplatformsandbox"
+    compileSdk = 33
     defaultConfig {
         minSdk = 24
-        targetSdk = 29
     }
 }
 ```
@@ -267,11 +268,12 @@ android {
 
 ```groovy
 android {
-    compileSdk 29
-    sourceSets.main.manifest.srcFile 'src/androidMain/AndroidManifest.xml'
+    // A typical Android configuration, see https://developer.android.com/build for details.
+    // For example:
+    namespace "com.example.kotlinmultiplatformsandbox"
+    compileSdk 33
     defaultConfig {
         minSdk 24
-        targetSdk 29
     }
 }
 ```
@@ -438,7 +440,6 @@ android {
     defaultConfig {
         applicationId = "org.example.androidApp"
         minSdk = 24
-        targetSdk = 29
         versionCode = 1
         versionName = "1.0"
     }
@@ -459,7 +460,6 @@ android {
     defaultConfig {
         applicationId 'org.example.androidApp'
         minSdk 24
-        targetSdk 29
         versionCode 1
         versionName '1.0'
     }
diff --git a/docs/topics/multiplatform/multiplatform-configure-compilations.md b/docs/topics/multiplatform/multiplatform-configure-compilations.md
index 9be9aab8817..694bbb9f5c8 100644
--- a/docs/topics/multiplatform/multiplatform-configure-compilations.md
+++ b/docs/topics/multiplatform/multiplatform-configure-compilations.md
@@ -43,10 +43,9 @@ kotlin {
 
 ```kotlin
 kotlin {
-    targets.jvm.compilations.all {
+    jvm().compilations.all {
         compilerOptions.configure {
-            sourceMap.set(true)
-            metaInfo.set(true)
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 }
@@ -59,8 +58,7 @@ kotlin {
 kotlin {
     jvm().compilations.all {
         compilerOptions.configure {
-            sourceMap.set(true)
-            metaInfo.set(true)
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 }
@@ -91,9 +89,11 @@ kotlin {
 
 ```groovy
 kotlin {
-    jvm().compilations.main {
-        compilerOptions.configure {
-            jvmTarget.set(JvmTarget.JVM_1_8)
+    jvm {
+        compilations.main {
+            compilerOptions.configure {
+                jvmTarget.set(JvmTarget.JVM_1_8)
+            }
         }
     }
 }
diff --git a/docs/topics/multiplatform/multiplatform-discover-project.md b/docs/topics/multiplatform/multiplatform-discover-project.md
index e66bed5e570..513d5a2ae1e 100644
--- a/docs/topics/multiplatform/multiplatform-discover-project.md
+++ b/docs/topics/multiplatform/multiplatform-discover-project.md
@@ -55,8 +55,8 @@ When you create a multiplatform project, targets are added to the `kotlin` block
 
 ```kotlin
 kotlin {
-    jvm()    
-    js {
+    jvm()
+    js(IR) {
         browser {}
     }
  }
diff --git a/docs/topics/multiplatform/multiplatform-dsl-reference.md b/docs/topics/multiplatform/multiplatform-dsl-reference.md
index ffed6842f97..a8c2fbe59fa 100644
--- a/docs/topics/multiplatform/multiplatform-dsl-reference.md
+++ b/docs/topics/multiplatform/multiplatform-dsl-reference.md
@@ -779,9 +779,9 @@ kotlin {
                 api("com.example:foo-metadata:1.0")
             }
         }
-        val jvm6Main by getting {
+        val jvmMain by getting {
             dependencies {
-                implementation("com.example:foo-jvm6:1.0")
+                implementation("com.example:foo-jvm:1.0")
             }
         }
     }
@@ -799,9 +799,9 @@ kotlin {
                 api 'com.example:foo-metadata:1.0'
             }
         }
-        jvm6Main {
+        jvmMain {
             dependencies {
-                implementation 'com.example:foo-jvm6:1.0'
+                implementation 'com.example:foo-jvm:1.0'
             }
         }
     }
@@ -811,7 +811,8 @@ kotlin {
 </tab>
 </tabs>
 
-Additionally, source sets can depend on each other and form a hierarchy. In this case, the [dependsOn()](#source-set-parameters) relation is used.
+Additionally, source sets can depend on each other and form a hierarchy.
+In this case, the [`dependsOn()`](#source-set-parameters) relation is used.
 
 Source set dependencies can also be declared in the top-level `dependencies` block of the build script.
 In this case, their declarations follow the pattern `<sourceSetName><DependencyKind>`, for example, `commonMainApi`.
diff --git a/docs/topics/multiplatform/multiplatform-hierarchy.md b/docs/topics/multiplatform/multiplatform-hierarchy.md
index 5f63a8c8256..2fbf8a1b1b0 100644
--- a/docs/topics/multiplatform/multiplatform-hierarchy.md
+++ b/docs/topics/multiplatform/multiplatform-hierarchy.md
@@ -4,7 +4,7 @@ Multiplatform projects support hierarchical structures.
 This means you can arrange a hierarchy of intermediate source sets for sharing the common code among some, but not all,
 [supported targets](multiplatform-dsl-reference.md#targets). Using intermediate source sets has some important advantages:
 
-* If you're a library author and you want to provide a specialized API, you can use an intermediate source set for some,
+* If you're a library author, and you want to provide a specialized API, you can use an intermediate source set for some,
   but not all, targets – for example, an intermediate source set for Kotlin/Native targets but not for Kotlin/JVM ones.
 * If you want to use platform-dependent libraries in your project, you can use an intermediate source set
   to use that specific API in several native targets. For example, you can have access to iOS-specific dependencies,
@@ -38,6 +38,9 @@ It's a [template](#see-the-full-hierarchy-template) for all possible targets and
 To set up a hierarchy, call `targetHierarchy.default()` in the `kotlin` block of your `build.gradle(.kts)` file and list
 all of the targets you need. For example:
 
+<tabs group="build-script">
+<tab title="Kotlin" group-key="kotlin">
+
 ```kotlin
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
@@ -50,6 +53,25 @@ kotlin {
 }
 ```
 
+</tab>
+<tab title="Groovy" group-key="groovy">
+
+```groovy
+kotlin {
+    // Enable the default target hierarchy:
+    targetHierarchy.default {
+      
+    }
+
+    android()
+    iosArm64()
+    iosSimulatorArm64()
+}
+```
+
+</tab>
+</tabs>
+
 When you declare the final targets `android`, `iosArm64`, and `iosSimulatorArm64` in your code, the Kotlin Gradle plugin finds
 suitable shared source sets from the template and creates them for you. The resulting hierarchy looks like this:
 
@@ -76,6 +98,9 @@ To do so, apply the `by getting` construction for the source sets created with `
 
 Consider this example of a project with a source set shared between the `jvm` and `native` targets only:
 
+<tabs group="build-script">
+<tab title="Kotlin" group-key="kotlin">
+
 ```kotlin
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
@@ -104,6 +129,43 @@ kotlin {
 }
 ```
 
+</tab>
+<tab title="Groovy" group-key="groovy">
+
+```groovy
+kotlin {
+    // Enable the default target hierarchy:
+    targetHierarchy.default {
+      
+    }
+
+    jvm()
+    iosArm64()
+    // The rest of the other targets, if needed.
+
+    sourceSets {
+        commonMain {
+          
+        }
+
+        jvmAndNativeMain {
+            dependsOn(commonMain)
+        }
+
+        nativeMain {
+            dependsOn(jvmAndNativeMain)
+        }
+
+        jvmMain {
+            dependsOn(jvmAndNativeMain)
+        }
+    }
+}
+```
+
+</tab>
+</tabs>
+
 It can be cumbersome to remove `dependsOn` relations that are automatically created by the `targetHierarchy.default()` call.
 In that case, use an entirely [manual configuration](#manual-configuration) instead of calling the default hierarchy.
 
@@ -142,12 +204,27 @@ combinations:
 All shortcuts create similar hierarchical structures in the code. For example, you can use the`ios()` shortcut to create
 a multiplatform project with 2 iOS-related targets, `iosArm64` and `iosX64`, and a shared source set:
 
+<tabs group="build-script">
+<tab title="Kotlin" group-key="kotlin">
+
 ```kotlin
 kotlin {
-    ios() // iOS device and simulator targets; iosMain and iosTest source sets
+    ios() // iOS device and the iosX64 simulator target; iosMain and iosTest source sets
+}
+```
+
+</tab>
+<tab title="Groovy" group-key="groovy">
+
+```groovy
+kotlin {
+    ios() // iOS device and the iosX64 simulator target; iosMain and iosTest source sets
 }
 ```
 
+</tab>
+</tabs>
+
 In this case, the hierarchical structure includes the intermediate source sets `iosMain` and `iosTest`,
 which are used by the platform-specific source sets:
 
diff --git a/docs/topics/multiplatform/multiplatform-share-on-platforms.md b/docs/topics/multiplatform/multiplatform-share-on-platforms.md
index ae1dd4ac83b..b17c62c05e8 100644
--- a/docs/topics/multiplatform/multiplatform-share-on-platforms.md
+++ b/docs/topics/multiplatform/multiplatform-share-on-platforms.md
@@ -19,7 +19,7 @@ just share it in the common source set.
 
 Some dependencies for source sets are set by default. You don't need to specify any `dependsOn` relations manually:
 * For all platform-specific source sets that depend on the common source set, such as `jvmMain`, `macosX64Main`, and others. 
-* Between the `main` and `test` source sets of a particular target, such as `androidMain` and `androidTest`.
+* Between the `main` and `test` source sets of a particular target, such as `androidMain` and `androidUnitTest`.
 
 If you need to access platform-specific APIs from the shared code, use the Kotlin mechanism of [expected and actual 
 declarations](multiplatform-connect-to-apis.md).
diff --git a/docs/topics/native/native-immutability.md b/docs/topics/native/native-immutability.md
index 6d9920edfec..60e351cc1e9 100644
--- a/docs/topics/native/native-immutability.md
+++ b/docs/topics/native/native-immutability.md
@@ -3,7 +3,9 @@
 > This page describes the features of the legacy memory manager. Check out [Kotlin/Native memory management](native-memory-manager.md)
 > to learn about the new memory manager, which has been enabled by default since Kotlin 1.7.20.
 >
-{type="note"}
+> For more information on the concurrent programming in Kotlin, see the [Coroutines guide](coroutines-guide.md).
+>
+{type="warning"}
 
 Kotlin/Native implements strict mutability checks, ensuring
 the important invariant that the object is either immutable or
diff --git a/docs/topics/native/native-ios-integration.md b/docs/topics/native/native-ios-integration.md
index 9f55d6e8c8c..73d177e0b3b 100644
--- a/docs/topics/native/native-ios-integration.md
+++ b/docs/topics/native/native-ios-integration.md
@@ -1,7 +1,7 @@
 [//]: # (title: iOS integration)
 
 > This page describes the new memory manager enabled by default since Kotlin 1.7.20. See our [migration guide](native-migration-guide.md)
-> to move your projects from the legacy memory manager.
+> to move your projects from the legacy memory manager that will be removed in Kotlin 1.9.20.
 >
 {type="note"}
 
diff --git a/docs/topics/native/native-memory-manager.md b/docs/topics/native/native-memory-manager.md
index 4f3ddee07e2..9fc400fab37 100644
--- a/docs/topics/native/native-memory-manager.md
+++ b/docs/topics/native/native-memory-manager.md
@@ -1,7 +1,7 @@
 [//]: # (title: Kotlin/Native memory management)
 
-> This page describes features of the new memory manager enabled by default since Kotlin 1.7.20.
-> See our [migration guide](native-migration-guide.md) to move your projects from the legacy memory manager.
+> This page describes features of the new memory manager enabled by default since Kotlin 1.7.20. See our [migration guide](native-migration-guide.md)
+> to move your projects from the legacy memory that will be removed in Kotlin 1.9.20.
 >
 {type="note"}
 
diff --git a/docs/topics/native/native-objc-interop.md b/docs/topics/native/native-objc-interop.md
index 44e01bb4cb8..a738fb805aa 100644
--- a/docs/topics/native/native-objc-interop.md
+++ b/docs/topics/native/native-objc-interop.md
@@ -402,7 +402,7 @@ class Sample<T>() {
 
 In order to support a potentially nullable type, the Objective-C header needs to define `myVal` with a nullable return value.
 
-To mitigate this, when defining your generic classes, if the generic type should *never* be null, provide a non-null 
+To mitigate this, when defining your generic classes, if the generic type should _never_ be null, provide a non-nullable 
 type constraint:
 
 ```kotlin
@@ -411,7 +411,7 @@ class Sample<T : Any>() {
 }
 ```
 
-That will force the Objective-C header to mark `myVal` as non-null.
+That will force the Objective-C header to mark `myVal` as non-nullable.
 
 #### Variance
 
@@ -431,8 +431,8 @@ let variOutAny : GenVarOut<BaseData> = variOut as! GenVarOut<BaseData>
 #### Constraints
 
 In Kotlin, you can provide upper bounds for a generic type. Objective-C also supports this, but that support is unavailable 
-in more complex cases, and is currently not supported in the Kotlin - Objective-C interop. The exception here being a non-null
-upper bound will make Objective-C methods/properties non-null.
+in more complex cases, and is currently not supported in the Kotlin - Objective-C interop. The exception here being a non-nullable
+upper bound will make Objective-C methods/properties non-nullable.
 
 #### To disable
 
diff --git a/docs/topics/no-arg-plugin.md b/docs/topics/no-arg-plugin.md
index 8691bf43141..24ad11a5650 100644
--- a/docs/topics/no-arg-plugin.md
+++ b/docs/topics/no-arg-plugin.md
@@ -2,21 +2,46 @@
 
 The *no-arg* compiler plugin generates an additional zero-argument constructor for classes with a specific annotation. 
 
-The generated constructor is synthetic so it can't be directly called from Java or Kotlin, but it can be called using reflection.
+The generated constructor is synthetic, so it can't be directly called from Java or Kotlin, but it can be called using reflection.
 
 This allows the Java Persistence API (JPA) to instantiate a class although it doesn't have the zero-parameter constructor
 from Kotlin or Java point of view (see the description of `kotlin-jpa` plugin [below](#jpa-support)).
 
+## In your Kotlin file
+
+Add new annotations to mark the code that needs a zero-argument constructor:
+
+```kotlin
+package com.my
+
+annotation class Annotation
+```
+
 ## Gradle
 
 Add the plugin using Gradle's plugins DSL:
 
+<tabs group="build-script">
+<tab title="Kotlin" group-key="kotlin">
+
+```kotlin
+plugins {
+    kotlin("plugin.noarg") version "%kotlinVersion%"
+}
+```
+
+</tab>
+<tab title="Groovy" group-key="groovy">
+
 ```groovy
 plugins {
-  id "org.jetbrains.kotlin.plugin.noarg" version "%kotlinVersion%"
+    id "org.jetbrains.kotlin.plugin.noarg" version "%kotlinVersion%"
 }
 ```
 
+</tab>
+</tabs>
+
 Then specify the list of no-arg annotations that must lead to generating a no-arg constructor for the annotated classes:
 
 ```groovy
@@ -74,12 +99,27 @@ and [`@MappedSuperclass`](https://docs.oracle.com/javaee/7/api/javax/persistence
 
 Add the plugin using the Gradle plugins DSL:
 
+<tabs group="build-script">
+<tab title="Kotlin" group-key="kotlin">
+
+```kotlin
+plugins {
+    kotlin("plugin.jpa") version "%kotlinVersion%"
+}
+```
+
+</tab>
+<tab title="Groovy" group-key="groovy">
+
 ```groovy
 plugins {
-  id "org.jetbrains.kotlin.plugin.jpa" version "%kotlinVersion%"
+    id "org.jetbrains.kotlin.plugin.jpa" version "%kotlinVersion%"
 }
 ```
 
+</tab>
+</tabs>
+
 In Maven, enable the `jpa` plugin:
 
 ```xml
diff --git a/docs/topics/null-safety.md b/docs/topics/null-safety.md
index e4036cfdb75..cd55ae25cee 100644
--- a/docs/topics/null-safety.md
+++ b/docs/topics/null-safety.md
@@ -1,6 +1,6 @@
 [//]: # (title: Null safety)
 
-## Nullable types and non-null types
+## Nullable types and non-nullable types
 
 Kotlin's type system is aimed at eliminating the danger of null references, also known as [The Billion Dollar Mistake](https://en.wikipedia.org/wiki/Null_pointer#History).
 
@@ -23,13 +23,13 @@ The only possible causes of an NPE in Kotlin are:
   * Other issues caused by external Java code.
 
 In Kotlin, the type system distinguishes between references that can hold `null` (nullable references) and those that
-cannot (non-null references).
+cannot (non-nullable references).
 For example, a regular variable of type `String` cannot hold `null`:
 
 ```kotlin
 fun main() {
 //sampleStart
-    var a: String = "abc" // Regular initialization means non-null by default
+    var a: String = "abc" // Regular initialization means non-nullable by default
     a = null // compilation error
 //sampleEnd
 }
@@ -196,7 +196,7 @@ fun foo(node: Node): String? {
 
 ## The `!!` operator
 
-The third option is for NPE-lovers: the not-null assertion operator (`!!`) converts any value to a non-null
+The third option is for NPE-lovers: the not-null assertion operator (`!!`) converts any value to a non-nullable
 type and throws an exception if the value is `null`. You can write `b!!`, and this will return a non-null value of `b`
 (for example, a `String` in our example) or throw an NPE if `b` is `null`:
 
@@ -217,7 +217,7 @@ val aInt: Int? = a as? Int
 
 ## Collections of a nullable type
 
-If you have a collection of elements of a nullable type and want to filter non-null elements, you can do so by using
+If you have a collection of elements of a nullable type and want to filter non-nullable elements, you can do so by using
 `filterNotNull`:
 
 ```kotlin
diff --git a/docs/topics/numbers.md b/docs/topics/numbers.md
index 69797ce7e50..16b6c97686b 100644
--- a/docs/topics/numbers.md
+++ b/docs/topics/numbers.md
@@ -13,8 +13,8 @@ For integer numbers, there are four types with different sizes and, hence, value
 | `Long`	 | 64        |-9,223,372,036,854,775,808 (-2<sup>63</sup>)|9,223,372,036,854,775,807 (2<sup>63</sup> - 1)|
 
 When you initialize a variable with no explicit type specification, the compiler automatically infers the type with the 
-smallest range enough to represent the value. If it is not exceeding the range of `Int`, the type is `Int`. If it exceeds,
-the type is `Long`. To specify the `Long` value explicitly, append the suffix `L` to the value. 
+smallest range enough to represent the value starting from `Int`. If it is not exceeding the range of `Int`, the type is `Int`.
+If it exceeds, the type is `Long`. To specify the `Long` value explicitly, append the suffix `L` to the value. 
 Explicit type specification triggers the compiler to check the value not to exceed the range of the specified type.
 
 ```kotlin
diff --git a/docs/topics/operator-overloading.md b/docs/topics/operator-overloading.md
index 42d59712986..c91d4d588cc 100644
--- a/docs/topics/operator-overloading.md
+++ b/docs/topics/operator-overloading.md
@@ -197,6 +197,7 @@ The `==` operation is special: it is translated to a complex expression that scr
 All comparisons are translated into calls to `compareTo`, that is required to return `Int`.
 
 ### Property delegation operators
+
 `provideDelegate`, `getValue` and `setValue` operator functions are described
 in [Delegated properties](delegated-properties.md).
 
diff --git a/docs/topics/properties.md b/docs/topics/properties.md
index f56d500f19f..0760b889df6 100644
--- a/docs/topics/properties.md
+++ b/docs/topics/properties.md
@@ -167,9 +167,9 @@ const val SUBSYSTEM_DEPRECATED: String = "This subsystem is deprecated"
 
 ## Late-initialized properties and variables
 
-Normally, properties declared as having a non-null type must be initialized in the constructor.
+Normally, properties declared as having a non-nullable type must be initialized in the constructor.
 However, it is often the case that doing so is not convenient. For example, properties can be initialized through dependency
-injection, or in the setup method of a unit test. In these cases, you cannot supply a non-null initializer in the constructor,
+injection, or in the setup method of a unit test. In these cases, you cannot supply a non-nullable initializer in the constructor,
 but you still want to avoid null checks when referencing the property inside the body of a class.
 
 To handle such cases, you can mark the property with the `lateinit` modifier:
@@ -190,7 +190,7 @@ public class MyTest {
 
 This modifier can be used on `var` properties declared inside the body of a class (not in the primary constructor,
 and only when the property does not have a custom getter or setter), as well as for top-level properties and local variables.
-The type of the property or variable must be non-null, and it must not be a primitive type.
+The type of the property or variable must be non-nullable, and it must not be a primitive type.
 
 Accessing a `lateinit` property before it has been initialized throws a special exception that clearly identifies the property
 being accessed and the fact that it hasn't been initialized.
diff --git a/docs/topics/releases.md b/docs/topics/releases.md
index 9f9e9b82daa..202c1ee5822 100644
--- a/docs/topics/releases.md
+++ b/docs/topics/releases.md
@@ -53,6 +53,17 @@ You can also use [preview versions of Kotlin](eap.md#build-details).
         <th>Build info</th>
         <th>Build highlights</th>
     </tr>
+    <tr>
+        <td><strong>1.9.10</strong>
+            <p>Released: <strong>August 23, 2023</strong></p>
+            <p><a href="https://github.com/JetBrains/kotlin/releases/tag/v1.9.10" target="_blank">Release on GitHub</a></p>
+        </td>
+        <td>
+            <p>A bug fix release for Kotlin 1.9.0.</p>
+            <p>Learn more about Kotlin 1.9.0 in <a href="whatsnew19.md" target="_blank">What's new in Kotlin 1.9.0</a>.</p>
+            <note>For Android Studio Giraffe and Hedgehog, the Kotlin plugin 1.9.10 will be delivered with upcoming Android Studios updates.</note>
+        </td>
+    </tr>
     <tr>
         <td><strong>1.9.0</strong>
             <p>Released: <strong>July 6, 2023</strong></p>
diff --git a/docs/topics/run-code-snippets.md b/docs/topics/run-code-snippets.md
index 3dcc97f9794..64498db522c 100644
--- a/docs/topics/run-code-snippets.md
+++ b/docs/topics/run-code-snippets.md
@@ -22,7 +22,7 @@ IntelliJ IDEA and Android Studio support Kotlin [scratch files and worksheets](h
   in a project, such as educational or demo materials.
 
   To create a Kotlin worksheet in a project directory, right-click the directory in the project tree and select
-  **New** | **Kotlin Worksheet**.
+  **New** | **Kotlin Class/File** | **Kotlin Worksheet**.
 
 Syntax highlighting, auto-completion, and other
 IntelliJ IDEA code editing features are supported in scratches and worksheets. There's no need to declare the `main()` function 
diff --git a/docs/topics/scope-functions.md b/docs/topics/scope-functions.md
index 327d0885b68..0a3831d7a07 100644
--- a/docs/topics/scope-functions.md
+++ b/docs/topics/scope-functions.md
@@ -75,7 +75,7 @@ Detailed information about these functions is provided in the dedicated sections
 
 Here is a short guide for choosing scope functions depending on the intended purpose:
 
-* Executing a lambda on non-null objects: `let`
+* Executing a lambda on non-nullable objects: `let`
 * Introducing an expression as a variable in local scope: `let`
 * Object configuration: `apply`
 * Object configuration and computing the result: `run`
diff --git a/docs/topics/tour/kotlin-tour-null-safety.md b/docs/topics/tour/kotlin-tour-null-safety.md
index a2d1fc2c586..b6d76cf33c9 100644
--- a/docs/topics/tour/kotlin-tour-null-safety.md
+++ b/docs/topics/tour/kotlin-tour-null-safety.md
@@ -41,7 +41,7 @@ fun main() {
     nullable = null
 
     // By default, null values aren't accepted
-    var inferredNonNull = "The compiler assumes non-null"
+    var inferredNonNull = "The compiler assumes non-nullable"
 
     // Throws a compiler error
     inferredNonNull = null
diff --git a/docs/topics/typecasts.md b/docs/topics/typecasts.md
index 7f025115800..43d609d2ccb 100644
--- a/docs/topics/typecasts.md
+++ b/docs/topics/typecasts.md
@@ -1,5 +1,12 @@
 [//]: # (title: Type checks and casts)
 
+In Kotlin, you can perform type checks to check the type of an object at runtime. Type casts convert objects to a 
+different type.
+
+> To learn specifically about **generics** type checks and casts, for example `List<T>`, `Map<K,V>`, see [Generics type checks and casts](generics.md#generics-type-checks-and-casts).
+>
+{type="tip"}
+
 ## is and !is operators
 
 Use the `is` operator or its negated form `!is` to perform a runtime check that identifies whether an object conforms to a given type:
@@ -9,7 +16,7 @@ if (obj is String) {
     print(obj.length)
 }
 
-if (obj !is String) { // same as !(obj is String)
+if (obj !is String) { // Same as !(obj is String)
     print("Not a String")
 } else {
     print(obj.length)
@@ -37,7 +44,7 @@ if (x !is String) return
 print(x.length) // x is automatically cast to String
 ```
 
-or if it is on the right-hand side of `&&` or `||` and the proper check (regular or negative) is on the left-hand side:
+Or if it is on the right-hand side of `&&` or `||` and the proper check (regular or negative) is on the left-hand side:
 
 ```kotlin
 // x is automatically cast to String on the right-hand side of `||`
@@ -60,17 +67,50 @@ when (x) {
 }
 ```
 
-Note that smart casts work only when the compiler can guarantee that the variable won't change between the check and the usage.
-More specifically, smart casts can be used under the following conditions:
-
-* `val` local variables - always, with the exception of [local delegated properties](delegated-properties.md).
-* `val` properties - if the property is private or internal or if the check is performed in the same [module](visibility-modifiers.md#modules) where the property is declared. Smart casts cannot be used on open properties or properties that have custom getters.
-* `var` local variables - if the variable is not modified between the check and the usage, is not captured in a lambda that modifies it, and is not a local delegated property.
-* `var` properties - never, because the variable can be modified at any time by other code.
+> Note that smart casts work only when the compiler can guarantee that the variable won't change between the check and its usage.
+>
+{type="warning"}
+
+Smart casts can be used in the following conditions:
+
+<table header-style="none">
+        <tr>
+        <td>
+            <code>val</code> local variables
+        </td>
+        <td>
+            Always, except <a href="delegated-properties.md">local delegated properties</a>.
+        </td>
+    </tr>
+        <tr>
+        <td>
+            <code>val</code> properties
+        </td>
+        <td>
+            If the property is <code>private</code>, <code>internal</code>, or if the check is performed in the same <a href="visibility-modifiers.md#modules">module</a> where the property is declared. Smart casts can't be used on <code>open</code> properties or properties that have custom getters.
+        </td>
+    </tr>
+        <tr>
+        <td>
+            <code>var</code> local variables
+        </td>
+        <td>
+            If the variable is not modified between the check and its usage, is not captured in a lambda that modifies it, and is not a local delegated property.
+        </td>
+    </tr>
+        <tr>
+        <td>
+            <code>var</code> properties
+        </td>
+        <td>
+            Never, because the variable can be modified at any time by other code.
+        </td>
+    </tr>
+</table>
 
 ## "Unsafe" cast operator
 
-Usually, the cast operator throws an exception if the cast isn't possible. And so, it's called *unsafe*.
+Usually, the cast operator throws an exception if the cast isn't possible. Thus, it's called _unsafe_.
 The unsafe cast in Kotlin is done by the infix operator `as`.
 
 ```kotlin
@@ -93,9 +133,4 @@ To avoid exceptions, use the *safe* cast operator `as?`, which returns `null` on
 val x: String? = y as? String
 ```
 
-Note that despite the fact that the right-hand side of `as?` is a non-null type `String`, the result of the cast is nullable.
-
-## Generics type checks and casts
-
-Please see the corresponding section in the [generics documentation page](generics.md#generics-type-checks-and-casts)
-for information on which type checks and casts you can perform with generics.
+Note that despite the fact that the right-hand side of `as?` is a non-nullable type `String`, the result of the cast is nullable.
diff --git a/docs/topics/whatsnew-eap.md b/docs/topics/whatsnew-eap.md
index 88087ff013c..23e27504115 100644
--- a/docs/topics/whatsnew-eap.md
+++ b/docs/topics/whatsnew-eap.md
@@ -1,264 +1,361 @@
-[//]: # (title: What's new in Kotlin 1.9.0-RC)
+[//]: # (title: What's new in Kotlin %kotlinEapVersion%)
 
 _[Released: %kotlinEapReleaseDate%](eap.md#build-details)_
 
 > This document doesn't cover all of the features of the Early Access Preview (EAP) release, but it highlights the latest
 > ones and some major improvements.
 >
-> See the full list of changes in the [GitHub changelog](https://github.com/JetBrains/kotlin/releases/tag/v1.9.0-RC).
+> See the full list of changes in the [GitHub changelog](https://github.com/JetBrains/kotlin/releases/tag/v%kotlinEapVersion%).
 >
 {type="note"}
 
-The Kotlin 1.9.0-RC release is out! Here are some highlights from this preview version of Kotlin:
+The Kotlin %kotlinEapVersion% release is out! Here are some highlights from this preview version:
 
-* [New Kotlin K2 compiler updates](#new-kotlin-k2-compiler-updates)
-* [Stable replacement of the enum class values function](#stable-replacement-of-the-enum-class-values-function)
-* [Stable ..< operator for open-ended ranges](#stable-operator-for-open-ended-ranges)
-* [New common function to get regex capture group by name](#new-common-function-to-get-regex-capture-group-by-name)
-* [New path utility to create parent directories](#new-path-utility-to-create-parent-directories)
-* [Preview of Gradle configuration cache in Kotlin Multiplatform](#preview-of-gradle-configuration-cache-in-kotlin-multiplatform)
-* [Changes for Android target support in Kotlin Multiplatform](#changes-for-android-target-support-in-kotlin-multiplatform)
-* [No object initialization when accessing constant values in Kotlin/Native](#no-object-initialization-when-accessing-constant-values-in-kotlin-native)
-* [Ability to configure standalone mode for iOS simulator tests in Kotlin/Native](#ability-to-configure-standalone-mode-for-ios-simulator-tests-in-kotlin-native)
+* [New default hierarchy template for setting up multiplatform projects](#template-for-configuring-multiplatform-projects)
+* [Full support for the Gradle Configuration cache in Kotlin Multiplatform](#full-support-for-the-gradle-configuration-cache-in-kotlin-multiplatform)
+* [Custom memory allocator enabled by default in Kotlin/Native](#custom-memory-allocator-enabled-by-default)
+* [Performance improvements for the garbage collector in Kotlin/Native](#performance-improvements-for-the-garbage-collector)
+* [New and renamed targets in Kotlin/Wasm](#new-wasm-wasi-target-and-the-renaming-of-the-wasm-target-to-wasm-js)
+* [Support for the WASI API in the standard library for Kotlin/Wasm](#support-for-the-wasi-api-in-the-standard-library)
 
 ## IDE support
 
-The Kotlin plugins that support 1.9.0-RC are available for:
+The Kotlin plugins that support %kotlinEapVersion% are available for:
 
-| IDE            | Supported versions            |
-|----------------|-------------------------------|
-| IntelliJ IDEA  | 2022.3.x, 2023.1.x            |
-| Android Studio | Giraffe (223), Hedgehog (231) |
+| IDE            | Supported versions                                     |
+|----------------|--------------------------------------------------------|
+| IntelliJ IDEA  | 2023.1.x, 2023.2.x                                     |
+| Android Studio | Hedgehog (2023.1.1 Beta 3), Iguana (2023.2.1 Canary 2) |
 
-## New Kotlin K2 compiler updates
+## Kotlin Multiplatform
 
-The Kotlin team continues to stabilize the K2 compiler. The 1.9.0-RC release introduces further advancements, including
-basic support for Kotlin/Native and improved Kotlin/JS stability in the K2 compiler. It's an important step towards full
-support of multiplatform projects. We would appreciate [your feedback](#share-your-feedback-on-the-new-k2-compiler) to
-help us with it.
+* [Template for configuring multiplatform projects](#template-for-configuring-multiplatform-projects)
+* [Full support for the Gradle Configuration cache](#full-support-for-the-gradle-configuration-cache-in-kotlin-multiplatform)
 
-Also, starting with 1.9.0-RC and until the release of Kotlin 2.0, you can easily test the K2 compiler in your projects.
-Add `kotlin.experimental.tryK2=true` to your `gradle.properties` file or run the following command:
+### Template for configuring multiplatform projects
 
-```shell
-./gradlew assemble -Pkotlin.experimental.tryK2=true
-```
+Starting with Kotlin %kotlinEapVersion%, the Kotlin Gradle plugin automatically creates shared source sets for popular multiplatform scenarios.
+If your project setup is one of them, you don't need to configure the source set hierarchy manually.
+Just explicitly specify the targets necessary for your project.
 
-This Gradle property automatically sets the language version to 2.0 and updates the build report with the number of
-Kotlin tasks compiled using the K2 compiler compared to the current compiler:
+Setup is now easier thanks to the default hierarchy template, a new feature of the Kotlin Gradle plugin.
+It's a predefined template of a source set hierarchy built into the plugin.
+It includes intermediate source sets that Kotlin automatically creates for the targets you declared.
+[See the full template](#see-the-full-hierarchy-template).
 
-```none
-##### 'kotlin.experimental.tryK2' results (Kotlin/Native not checked) #####
-:lib:compileKotlin: 2.0 language version
-:app:compileKotlin: 2.0 language version
-##### 100% (2/2) tasks have been compiled with Kotlin 2.0 #####
-```
+#### Create your project easier
 
-### Share your feedback on the new K2 compiler
+Consider a multiplatform project that targets both Android and iPhone devices and is developed on an Apple silicon MacBook.
+Compare how this project is set up between different versions of Kotlin:
 
-We'd appreciate any feedback you might have!
+<table header-style="top">
+   <tr>
+       <td>Kotlin 1.9.0 and earlier (a standard setup)</td>
+       <td>Kotlin 1.9.20-Beta</td>
+   </tr>
+   <tr>
+<td>
 
-* Provide your feedback directly to K2 developers in the Kotlin Slack – [get an invite](https://surveys.jetbrains.com/s3/kotlin-slack-sign-up?_gl=1*ju6cbn*_ga*MTA3MTk5NDkzMC4xNjQ2MDY3MDU4*_ga_9J976DJZ68*MTY1ODMzNzA3OS4xMDAuMS4xNjU4MzQwODEwLjYw)
-  and join the [#k2-early-adopters](https://kotlinlang.slack.com/archives/C03PK0PE257) channel.
-* Report any problems you've faced with the new K2 compiler via [our issue tracker](https://kotl.in/issue).
-* [Enable the **Send usage statistics** option](https://www.jetbrains.com/help/idea/settings-usage-statistics.html) to
-  allow JetBrains to collect anonymous data about K2 usage.
+```kotlin
+kotlin {
+    androidTarget()
+    iosArm64()
+    iosSimulatorArm64()
 
-## Stable replacement of the enum class values function
+    sourceSets {
+        val commonMain by getting
 
-In 1.8.20, the `entries` property for enum classes was introduced as an Experimental feature. The `entries` property is intended to be a modern and performant replacement for the synthetic `values()` function. In 1.9.0-RC, the `entries` property is [Stable](components-stability.md#stability-levels-explained).
+        val iosMain by creating {
+            dependsOn(commonMain)
+        }
 
-> The `values()` function is still supported, but we recommend that you use the `entries` property instead.
->
-{type="tip"}
+        val iosArm64Main by getting {
+            dependsOn(iosMain)
+        }
 
-```kotlin
-enum class Color(val colorName: String, val rgb: String) {
-    RED("Red", "#FF0000"),
-    ORANGE("Orange", "#FF7F00"),
-    YELLOW("Yellow", "#FFFF00")
+        val iosSimulatorArm64Main by getting {
+            dependsOn(iosMain)
+        }
+    }
 }
+```
+
+</td>
+<td>
 
-fun findByRgb(rgb: String): Color? = Color.entries.find { it.rgb == rgb }
+```kotlin
+kotlin {
+    androidTarget()
+    iosArm64()
+    iosSimulatorArm64()
+   
+    // The iosMain source set is created automatically
+}
 ```
-{validate="false"}
 
-For more information about the `entries` property for enum classes, see [What's new in Kotlin 1.8.20](whatsnew1820.md#a-modern-and-performant-replacement-of-the-enum-class-values-function).
+</td>
+</tr>
+</table>
+
+Notice how the use of the default hierarchy template considerably reduces the amount of boilerplate code needed to set
+up your project.
+
+When you declare the `androidTarget`, `iosArm64`, and `iosSimulatorArm64` targets in your code, the Kotlin Gradle plugin finds
+suitable shared source sets from the template and creates them for you. The resulting hierarchy looks like this:
+
+![An example of the default target hierarchy in use](default-hierarchy-example.svg){thumbnail="true" width="350" thumbnail-same-file="true"}
+
+Green source sets are actually created and included in the project, while gray ones from the default template are ignored.
 
-## Stable ..< operator for open-ended ranges
+#### Enjoy improved tooling support
 
-The new `..<` operator for open-ended ranges that was introduced in [Kotlin 1.7.20](whatsnew1720.md#preview-of-the-operator-for-creating-open-ended-ranges)
-is Stable in 1.9.0-RC. The standard library API for working with open-ended ranges is also Stable in this release.
+To make it easier to work with the created project structure, IntelliJ IDEA now provides completion for source sets created with the default hierarchy template:
 
-Our research shows that the new `..<` operator makes it easier to understand when an open-ended range is declared. If 
-you use the [`until`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.ranges/until.html) infix function, it's easy 
-to make the mistake of assuming that the upper bound is included.
+<img src="multiplatform-hierarchy-completion.png" alt="IDE completion for source set names" width="350" animated="true"/>
 
-Here is an example using the `until` function:
+The IDE also warns you if you attempt to access a source set that doesn't exist because you haven't declared the respective target.
+In the example below, there is no JVM target (only `androidTarget`, which is not the same). But let's try to use the `jvmMain` source set
+and see what happens:
 
 ```kotlin
-fun main() {
-    for (number in 2 until 10) {
-        if (number % 2 == 0) {
-            print("$number ")
+kotlin {
+    androidTarget()
+    iosArm64()
+    iosSimulatorArm64()
+
+    sourceSets {
+        jvmMain {
         }
     }
-    // 2 4 6 8
 }
 ```
-{validate="false"}
 
-And here is an example using the new `..<` operator:
+In this case, Kotlin reports a warning in the build log:
 
-```kotlin
-fun main() {
-    for (number in 2..<10) {
-        if (number % 2 == 0) {
-            print("$number ")
-        }
-    }
-    // 2 4 6 8
-}
+```none
+w: Accessed 'source set jvmMain' without registering the jvm target:
+  kotlin {
+      jvm() /* <- register the 'jvm' target */
+
+      sourceSets.jvmMain.dependencies {
+
+      }
+  }
 ```
-{validate="false"}
 
-> Starting with version 2023.1.1, IntelliJ IDEA has a new code inspection that highlights when you can use the `..<` operator.
->
-{type="note"}
+#### Set up the target hierarchy
 
-For more information about what you can do with this operator, see [What's new in Kotlin 1.7.20](whatsnew1720.md#preview-of-the-operator-for-creating-open-ended-ranges).
+Starting with Kotlin %kotlinEapVersion%, the default hierarchy template is automatically enabled. In most cases, no additional setup is required.
 
-## New common function to get regex capture group by name
+However, if you're migrating existing projects created before 1.9.20, you might encounter a warning if you had previously
+introduced intermediate sources manually with  `dependsOn()` calls. To solve this issue, do the following:
 
-Prior to 1.9.0-RC, every platform had its own extension to get a regular expression capture group by its name from a regular expression match.
-However, there was no common function. It wasn't possible to implement prior to Kotlin 1.8.0,
-because the standard library still supported JVM targets 1.6 and 1.7.
+* If your intermediate source sets are currently covered by the default hierarchy template, remove all manual `dependsOn()`
+calls and source sets created with `by creating` constructions.
 
-As of Kotlin 1.8.0, the standard library is compiled with JVM target 1.8. So in 1.9.0-RC,
-there is now a **common** function [`groups`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.text/-match-result/groups.html)
-that retrieves group's contents by its name for a regular expression match.
-This is useful when you want to access the results of regular expression matches belonging to a particular capture group.
+  To check the list of all default source sets, see the [full hierarchy template](#see-the-full-hierarchy-template).
 
-Here is an example with a regular expression containing three capture groups: `city`, `state`, and `areaCode`.
-You can use these group names to access the matched values:
+* If you want to have additional source sets that the default hierarchy template doesn't provide, for example between JS and the JVM,
+adjust the hierarchy by reapplying the template explicitly with `applyDefaultHierarchyTemplate()` and configuring additional
+source sets manually as usual with `dependsOn()`:
 
 ```kotlin
-fun main() {
-    val regex = """\b(?<city>[A-Za-z\s]+),\s(?<state>[A-Z]{2}):\s(?<areaCode>[0-9]{3})\b""".toRegex()
-    val input = "Coordinates: Austin, TX: 123"
-
-
-    val match = regex.find(input)!!
-    println(match.groups["city"]?.value) 
-    // Austin
-    println(match.groups["state"]?.value)
-    // TX
-    println(match.groups["areaCode"]?.value)
-    // 123
+kotlin {
+    jvm()
+    js { browser() }
+    iosArm64()
+    iosSimulatorArm64()
+
+    // Apply the default hierarchy explicitly. It'll create, for example, the iosMain source set:
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        // Create an additional jsAndJvmMain source set
+        val jsAndJvmMain by creating {
+            dependsOn(commonMain.get())
+    }
+
+        jsMain.get().dependsOn(jsAndJvmMain)
+        jvmMain.get().dependsOn(jsAndJvmMain)
+    }
 }
 ```
-{validate="false"}
 
-## New path utility to create parent directories
+* If there are already source sets in your project that have the exact same names as those generated by the template
+but that are shared among different sets of targets, there's currently no way to modify the default `dependsOn` relations between
+the template's source sets.
 
-In 1.9.0-RC there is a new extension function `createParentDirectories()` that you can use to create a new file with 
-all the necessary parent directories. When you provide a file path to `createParentDirectories()`, it checks whether the parent
-directories already exist. If they do, it does nothing. However, if they do not, it creates them for you.
+  One option you have here is to find different source sets for your purposes, either in the default hierarchy template
+  or ones that have been manually created. Another is to opt out of the template completely.
 
-`createParentDirectories()` is particularly useful when you are copying files. For example, you can use it in combination
-with the [`copyToRecursively()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.io.path/java.nio.file.-path/copy-to-recursively.html) function:
+  To opt out, add `kotlin.mpp.applyDefaultHierarchyTemplate=false` to your `gradle.properties` and configure all other
+  source sets manually.
 
-```kotlin
-sourcePath.copyToRecursively(
-    destinationPath.createParentDirectories(),
-    followLinks = false
-)
-```
-{validate="false"}
+  We're currently working on an API for creating your own hierarchy templates to simplify the setup process in such cases.
 
-## Preview of Gradle configuration cache in Kotlin Multiplatform
+#### See the full hierarchy template {initial-collapse-state="collapsed"}
 
-Kotlin 1.9.0-RC comes with support for [Gradle configuration cache](https://docs.gradle.org/current/userguide/configuration_cache.html)
-in multiplatform libraries. If you're a library author, you can already benefit from the improved build performance.
+When you declare the targets to which your project compiles,
+the plugin picks the shared source sets from the template accordingly and creates them in your project.
 
-Gradle configuration cache speeds up the build process by reusing the results of the configuration phase for subsequent 
-builds. The feature has become Stable since Gradle 8.1. To enable it, follow the instructions in the [Gradle documentation](https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:usage).
+![Default hierarchy template](full-template-hierarchy.svg)
 
-> The Kotlin Multiplatform plugin still doesn't support Gradle configuration cache with Xcode integration tasks or the 
-> [Kotlin CocoaPods Gradle plugin](native-cocoapods-dsl-reference.md). We expect to add this feature in a future Kotlin release.
+> This example only shows the production part of the project, omitting the `Main` suffix
+> (for example, using `common` instead of `commonMain`). However, everything is the same for `*Test` sources as well.
 >
-{type="note"}
+{type="tip"}
 
-## Changes for Android target support in Kotlin Multiplatform
+### Full support for the Gradle configuration cache in Kotlin Multiplatform
 
-We continue our efforts to stabilize Kotlin Multiplatform. An essential step in this direction is to provide first-class support
-for the Android target. We're excited to announce that in the future, the Android team from Google will provide its own 
-Gradle plugin to support Android in Kotlin Multiplatform.
+Previously, we introduced a [preview](whatsnew19.md#preview-of-the-gradle-configuration-cache) of the Gradle configuration
+cache, which was available for Kotlin multiplatform libraries. With %kotlinEapVersion%, the Kotlin Multiplatform plugin takes a step further.
 
-To open the way for the new solution from Google, we're renaming the `android` block to `androidTarget` in the current 
-Kotlin DSL in 1.9.0-RC. This is a temporary change that is necessary to free the `android` name for the upcoming DSL 
-from Google.
+It now supports the Gradle configuration cache in the [Kotlin CocoaPods Gradle plugin](native-cocoapods-dsl-reference.md),
+as well as in the integration tasks that are necessary for Xcode builds, like `embedAndSignAppleFrameworkForXcode`.
 
-The Google plugin will be the preferred way of working with Android in multiplatform projects. When it's ready, we'll 
-provide the necessary migration instructions so that you'll be able to use the short `android` name as before.
+Now all multiplatform projects can take advantage of the improved build time.
+The Gradle configuration cache speeds up the build process by reusing the results of the configuration phase for subsequent builds.
+For more details and setup instructions, see the [Gradle documentation](https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:usage).
 
-## No object initialization when accessing constant values in Kotlin/Native
+## Kotlin/Native
 
-Starting with Kotlin 1.9.0-RC, the Kotlin/Native backend doesn't initialize objects when accessing `const val` fields:
+* [Custom memory allocator enabled by default](#custom-memory-allocator-enabled-by-default)
+* [Performance improvements for garbage collector](#performance-improvements-for-the-garbage-collector)
 
-```kotlin
-object MyObject {
-    init {
-        println("side effect!")
-    }
-    
-    const val y = 1
-}
+### Custom memory allocator enabled by default
+
+Kotlin %kotlinEapVersion% comes with the new memory allocator enabled by default. It's designed to replace the previous default allocator,
+`mimaloc`, to make garbage collection more efficient and improve the runtime performance of the [Kotlin/Native memory manager](native-memory-manager.md).
+
+The new custom allocator divides system memory into pages, allowing independent sweeping in consecutive order.
+Each allocation becomes a memory block within a page, and the page keeps track of block sizes.
+Different page types are optimized for various allocation sizes.
+The consecutive arrangement of memory blocks ensures efficient iteration through all allocated blocks.
+
+When a thread allocates memory, it searches for a suitable page based on the allocation size.
+Threads maintain a set of pages for different size categories.
+Typically, the current page for a given size can accommodate the allocation.
+If not, the thread requests a different page from the shared allocation space.
+This page may already be available, require sweeping, or have to be created first.
+
+The new allocator allows for multiple independent allocation spaces simultaneously,
+which will enable the Kotlin team to experiment with different page layouts to improve performance even further.
+
+#### How to enable the custom memory allocator
+
+Starting with Kotlin %kotlinEapVersion%, the new memory allocator is the default. No additional setup is required.
+
+If you experience high memory consumption, you can switch back to `mimaloc` or the system allocator with `-Xallocator=mimalloc`
+or `-Xallocator=std` in your Gradle build script. Please report such issues in [YouTrack](https://kotl.in/issue) to help
+us improve the new memory allocator.
+
+For the technical details of the new allocator's design, see this [README](https://github.com/JetBrains/kotlin/blob/master/kotlin-native/runtime/src/custom_alloc/README.md).
+
+### Performance improvements for the garbage collector
+
+The Kotlin team continues to improve the performance and stability of the new Kotlin/Native memory manager.
+This release brings a number of significant changes to the garbage collector (GC), including the following %kotlinEapVersion% highlights:
+
+* [](#full-parallel-mark-to-reduce-the-pause-time-for-the-gc)
+* [](#tracking-memory-in-big-chunks-to-improve-the-allocation-performance)
+
+#### Full parallel mark to reduce the pause time for the GC
+
+Previously, the default garbage collector performed only a partial parallel mark. When the mutator thread was paused,
+it would mark the GC's start from its own roots, like thread-local variables and the call stack.
+Meanwhile, a separate GC thread was responsible for marking the start from global roots, as well as the roots of all mutators
+that were actively running the native code and therefore not paused.
+
+This approach worked well in cases where there were a limited number of global objects and the mutator threads spent
+a considerable amount of time in a runnable state executing Kotlin code. However, this is not the case for typical iOS applications.
+
+Now the GC uses a full parallel mark that combines paused mutators, the GC thread, and optional marker threads to process
+the mark queue. By default, the marking process is performed by:
+
+* Paused mutators. Instead of processing their own roots and then being idle while not actively executing code, they contribute
+to the whole marking process.
+* The GC thread. This ensures that at least one thread will perform marking.
+
+This new approach makes the marking process more efficient, reducing the pause time of the GC.
 
+#### Tracking memory in big chunks to improve the allocation performance
 
-fun main() {
-    println(MyObject.y)	// no initialization at first
-    val x = MyObject	// initialization occurs
-    println(x.y)
+Previously, the GC scheduler tracked the allocation of each object individually. However, neither the new default custom
+allocator nor the `mimalloc` memory allocator allocates separate storage for each object; they allocate large areas for several objects at once.
+
+In Kotlin %kotlinEapVersion%, the GC tracks areas instead of individual objects. This speeds up the allocation of small objects by reducing
+the number of tasks performed on each allocation and, therefore, helps to minimize the garbage collector's memory usage.
+
+## Kotlin/Wasm
+
+* [New `wasm-wasi` target, and the renaming of the `wasm` target to `wasm-js`](#new-wasm-wasi-target-and-the-renaming-of-the-wasm-target-to-wasm-js)
+* [Support for the WASI API in standard library](#support-for-the-wasi-api-in-the-standard-library)
+
+> Kotlin Wasm is [Experimental](components-stability.md).
+> It may be changed at any time. Use it only for evaluation purposes.
+>
+> We would appreciate your feedback on it in [YouTrack](https://kotl.in/issue).
+>
+{type="warning"}
+
+### New `wasm-wasi` target, and the renaming of the `wasm` target to `wasm-js`
+
+In this release, we're introducing a new target for Kotlin/Wasm – `wasm-wasi`. We're also renaming the `wasm` target to `wasm-js`.
+In the Gradle DSL, these targets are available as `wasmWasi` and `wasmJs`, respectively.
+
+To use these targets in your project, update the `build.gradle.kts` file:
+
+```kotlin
+kotlin {
+   wasmWasi {
+      // ...
+   }
+   wasmJs {
+      // ...
+   }
 }
 ```
 
-Now the behavior is unified with Kotlin/JVM, where the implementation is consistent with Java and objects are never 
-initialized in this case. You can also expect some performance improvements in your Kotlin/Native projects thanks to this
-change.
+The previously introduced `wasm` block has been deprecated in favor of `wasmJs`.
+
+To migrate your existing Kotlin/Wasm project, do the following:
+* In the `build.gradle.kts` file, rename the `wasm` block to `wasmJs`.
+* In your project structure, rename the `wasmMain` folder to `wasmJsMain`.
+
+### Support for the WASI API in the standard library
+
+In this release, we have included support for [WASI](https://github.com/WebAssembly/WASI), a system interface for the Wasm platform.
+WASI support makes it easier for you to use Kotlin/Wasm outside of browsers, for example in server-side applications, by offering
+a standardized set of APIs for accessing system resources. In addition, WASI provides capability-based security – another
+layer of security when accessing external resources.
 
-## Ability to configure standalone mode for iOS simulator tests in Kotlin/Native
+To run Kotlin/Wasm applications, you need a VM that supports Wasm Garbage Collection (GC), for example Node.js or Deno.
+Wasmtime, WasmEdge, and others are still working towards full Wasm GC support.
 
-By default, when running iOS simulator tests for Kotlin/Native, the `--standalone` flag is used to avoid manual simulator
-booting and shutdown. In 1.9.0-RC, you can now configure whether this flag is used in a Gradle task via the `standalone`
-property. By default, the `--standalone` flag is used so standalone mode is enabled.
+To import a WASI function, use the `@WasmImport` annotation:
 
-Here is an example of how to disable standalone mode in your `build.gradle.kts` file:
 ```kotlin
-tasks.withType<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>().configureEach {
-    standalone.set(false)
-}
+import kotlin.wasm.WasmImport
+
+@WasmImport("wasi_snapshot_preview1", "clock_time_get")
+private external fun wasiRawClockTimeGet(clockId: Int, precision: Long, resultPtr: Int): Int
 ```
-{validate="false"}
 
-> If you disable standalone mode, you must boot the simulator manually. To boot your simulator from CLI, you can use the
-> following command:
+[You can find a full example in our GitHub repository](https://github.com/Kotlin/kotlin-wasm-examples/tree/main/wasi-example).
+
+> It isn't possible to use [interoperability with JavaScript](wasm-js-interop.md), while targeting `wasmWasi`.
 >
-> ```shell
-> /usr/bin/xcrun simctl boot <DeviceId>
-> ```
-> 
-{type = "warning"}
+{type="note"}
 
-## How to update to Kotlin 1.9.0-RC
+## How to update to Kotlin %kotlinEapVersion%
 
-Install Kotlin 1.9.0-RC in any of the following ways:
+Install Kotlin %kotlinEapVersion% in any of the following ways:
 
-* If you use the _Early Access Preview_ update channel, the IDE will suggest automatically updating to 1.9.0-RC as
+* If you use the _Early Access Preview_ update channel, the IDE will suggest automatically updating to %kotlinEapVersion% as
   soon as it becomes available.
 * If you use the _Stable_ update channel, you can change the channel to _Early Access Preview_ at any time by selecting
   **Tools** | **Kotlin** | **Configure Kotlin Plugin Updates** in your IDE. You'll then be able to install the latest
   preview release. Check out [these instructions](install-eap-plugin.md) for details.
 
-Once you've installed 1.9.0-RC don't forget to [change the Kotlin version](configure-build-for-eap.md)
-to 1.9.0-RC in your build scripts.
+Once you've installed %kotlinEapVersion% don't forget to [change the Kotlin version](configure-build-for-eap.md)
+to %kotlinEapVersion% in your build scripts.
\ No newline at end of file
diff --git a/docs/topics/whatsnew14.md b/docs/topics/whatsnew14.md
index 2b6b3f287fd..88a5a66faff 100644
--- a/docs/topics/whatsnew14.md
+++ b/docs/topics/whatsnew14.md
@@ -584,7 +584,7 @@ For more information about default methods in the Java interop, see the [interop
 
 Starting from Kotlin 1.4.0, all runtime null checks will throw a `java.lang.NullPointerException` instead of `KotlinNullPointerException`,
 `IllegalStateException`, `IllegalArgumentException`, and `TypeCastException`. This applies to: the `!!` operator, parameter
-null checks in the method preamble, platform-typed expression null checks, and the `as` operator with a non-null type.
+null checks in the method preamble, platform-typed expression null checks, and the `as` operator with a non-nullable type.
 This doesn't apply to `lateinit` null checks and explicit library function calls like `checkNotNull` or `requireNotNull`.
 
 This change increases the number of possible null check optimizations that can be performed either by the Kotlin compiler
diff --git a/docs/v.list b/docs/v.list
index 94ddfb0d876..81a4e0f5234 100644
--- a/docs/v.list
+++ b/docs/v.list
@@ -4,15 +4,15 @@
 
 <vars>
 
-    <var name="kotlinVersion" value="1.9.0" type="string"/>
+    <var name="kotlinVersion" value="1.9.10" type="string"/>
 
-    <var name="kotlinEapVersion" value="1.9.0-RC" type="string"/>
+    <var name="kotlinEapVersion" value="1.9.20-Beta" type="string"/>
 
-    <var name="kotlinLatestUrl" value="https://github.com/JetBrains/kotlin/releases/tag/v1.9.0" type="string"/>
+    <var name="kotlinLatestUrl" value="https://github.com/JetBrains/kotlin/releases/tag/v1.9.10" type="string"/>
 
-    <var name="kotlinReleaseDate" value="July 6, 2023" type="string"/>
+    <var name="kotlinReleaseDate" value="August 23, 2023" type="string"/>
 
-    <var name="kotlinEapReleaseDate" value="June 20, 2023" type="string"/>
+    <var name="kotlinEapReleaseDate" value="September 11, 2023" type="string"/>
 
     <var name="coroutinesVersion" value="1.7.1" type="string"/>
 
@@ -28,6 +28,10 @@
 
     <var name="gradleVersion" value="7.6" type="string"/>
 
+    <var name="gradleLanguageVersion" value="KOTLIN_2_0" type="string"/>
+
+    <var name="gradleApiVersion" value="KOTLIN_2_0" type="string"/>
+
     <var name="serializationVersion" value="1.5.1" type="string"/>
 
     <var name="defaultJvmTargetVersion" value="1.8" type="string"/>
@@ -40,9 +44,9 @@
 
     <var name="sqlDelightVersion" value="1.5.5" type="string"/>
 
-    <var name="kspSupportedKotlinVersion" value="1.9.0" type="string"/>
+    <var name="kspSupportedKotlinVersion" value="1.9.10" type="string"/>
 
-    <var name="kspVersion" value="1.0.11" type="string"/>
+    <var name="kspVersion" value="1.0.13" type="string"/>
 
     <var name="ktorVersion" value="2.3.2" type="string"/>
 
diff --git a/package.json b/package.json
index 580fd811578..e9905ffd351 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@babel/core": "7.15.8",
     "@babel/register": "7.15.3",
     "@jetbrains/babel-preset-jetbrains": "^2.3.1",
-    "@jetbrains/kotlin-web-site-ui": "4.5.1",
+    "@jetbrains/kotlin-web-site-ui": "4.7.1",
     "@react-hook/resize-observer": "1.2.5",
     "@rescui/button": "0.4.0",
     "@rescui/card": "0.5.0",
@@ -74,7 +74,6 @@
     "use-match-media-hook": "1.0.1",
     "validator": "13.7.0",
     "webpack": "5.76.0",
-    "webpack-cli": "4.7.2",
     "whatwg-fetch": "2.0.2"
   },
   "devDependencies": {
@@ -91,6 +90,7 @@
     "prettier": "2.6.2",
     "start-server-and-test": "1.14.0",
     "typescript": "4.6.3",
+    "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.3.1",
     "yaml-loader": "0.7.0"
   },
diff --git a/static/css/com/layout/images/mascot-404.svg b/static/css/com/layout/images/mascot-404.svg
new file mode 100644
index 00000000000..5cd694e8965
--- /dev/null
+++ b/static/css/com/layout/images/mascot-404.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 355.2 261.5" style="enable-background:new 0 0 355.2 261.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C4C4C4;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_00000127016265173880119550000000724076802829820349_);}
+	.st3{fill:url(#SVGID_00000119093026589812040530000016394519053244703900_);}
+	.st4{fill:url(#SVGID_00000118362777777385173800000007949944778457408190_);}
+	.st5{fill:url(#SVGID_00000145042559150603681860000012904146806325302706_);}
+	.st6{fill:url(#SVGID_00000088843861376671192650000014658954038631371926_);}
+	.st7{fill:url(#SVGID_00000134230729014953165530000017241433735864466855_);}
+	.st8{fill:url(#SVGID_00000070832782829163523120000001103177333779410609_);}
+	.st9{fill:#FFFFFF;}
+	.st10{fill:#D8D8D8;}
+	.st11{opacity:0.3;}
+	.st12{fill:#8C8C8C;}
+	.st13{fill:#E2E2E2;}
+	.st14{fill:url(#SVGID_00000123430234698668125110000008185397737153805445_);}
+	.st15{fill:url(#SVGID_00000141429319157652222780000011125252321767813771_);}
+</style>
+<g>
+	<path class="st0" d="M40.1,153.9c0,0,10-14.7,25.5-22.7c14.4-7.5,30.5-5.4,41.1-13.7c20.2-15.9,22.8-28.9,22.8-28.9L89.4,33.7
+		c0,0-7.5,21.5-23.2,29.3C53.7,69.1,39.1,68,25,75.6C9.7,83.8,0,99,0,99L40.1,153.9z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="259.0445" y1="275.8164" x2="326.4554" y2="166.3831">
+		<stop  offset="0.312" style="stop-color:#C4C4C4"/>
+		<stop  offset="0.3708" style="stop-color:#B7B7B7;stop-opacity:0.9488"/>
+		<stop  offset="0.5458" style="stop-color:#969696;stop-opacity:0.7961"/>
+		<stop  offset="0.7133" style="stop-color:#7E7E7E;stop-opacity:0.65"/>
+		<stop  offset="0.8687" style="stop-color:#707070;stop-opacity:0.5145"/>
+		<stop  offset="1" style="stop-color:#6B6B6B;stop-opacity:0.4"/>
+	</linearGradient>
+	<polygon class="st1" points="355.2,214.2 277.6,258.9 245.5,203.4 323.1,158.6 	"/>
+	
+		<linearGradient id="SVGID_00000147935944695265089240000005040501928947907745_" gradientUnits="userSpaceOnUse" x1="31.4379" y1="168.5865" x2="112.7723" y2="285.8731">
+		<stop  offset="0.312" style="stop-color:#C4C4C4"/>
+		<stop  offset="0.3708" style="stop-color:#B7B7B7;stop-opacity:0.9488"/>
+		<stop  offset="0.5458" style="stop-color:#969696;stop-opacity:0.7961"/>
+		<stop  offset="0.7133" style="stop-color:#7E7E7E;stop-opacity:0.65"/>
+		<stop  offset="0.8687" style="stop-color:#707070;stop-opacity:0.5145"/>
+		<stop  offset="1" style="stop-color:#6B6B6B;stop-opacity:0.4"/>
+	</linearGradient>
+	<polygon style="fill:url(#SVGID_00000147935944695265089240000005040501928947907745_);" points="110,218.1 25,232.3 0,187 
+		26.4,182.6 85,172.7 	"/>
+	<g>
+		
+			<linearGradient id="SVGID_00000101824791929439713060000003531813980108203425_" gradientUnits="userSpaceOnUse" x1="102.7365" y1="67.3241" x2="13.9913" y2="136.3481">
+			<stop  offset="0.1528" style="stop-color:#C4C4C4"/>
+			<stop  offset="0.342" style="stop-color:#6B6B6B;stop-opacity:0.4"/>
+			<stop  offset="0.3557" style="stop-color:#7A7A7A;stop-opacity:0.4359"/>
+			<stop  offset="0.3869" style="stop-color:#959595;stop-opacity:0.5174"/>
+			<stop  offset="0.4209" style="stop-color:#AAAAAA;stop-opacity:0.6064"/>
+			<stop  offset="0.4587" style="stop-color:#B9B9B9;stop-opacity:0.7052"/>
+			<stop  offset="0.5032" style="stop-color:#C1C1C1;stop-opacity:0.8217"/>
+			<stop  offset="0.5714" style="stop-color:#C4C4C4"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000101824791929439713060000003531813980108203425_);" d="M40.1,153.9c0,0,10-14.7,25.5-22.7
+			c14.4-7.5,30.5-5.4,41.1-13.7c20.2-15.9,22.8-28.9,22.8-28.9L89.4,33.7c0,0-7.5,21.5-23.2,29.3C53.7,69.1,39.1,68,25,75.6
+			C9.7,83.8,0,99,0,99L40.1,153.9z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000039114706415061978530000007761416116817142455_" gradientUnits="userSpaceOnUse" x1="-5011.8896" y1="252.2927" x2="-5011.8896" y2="146.7337" gradientTransform="matrix(-1 0 0 1 -4813.5654 0)">
+			<stop  offset="0.3158" style="stop-color:#7F52FF"/>
+			<stop  offset="0.5199" style="stop-color:#7C4FFC"/>
+			<stop  offset="0.6872" style="stop-color:#7247F2"/>
+			<stop  offset="0.8415" style="stop-color:#6139E0"/>
+			<stop  offset="0.9871" style="stop-color:#4926C9"/>
+			<stop  offset="1" style="stop-color:#4724C6"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000039114706415061978530000007761416116817142455_);" d="M211.7,261.5c6.4,0,11.6-5.2,11.7-11.6
+			c0.1-6.5-5.1-11.7-11.6-11.8l-5.9-0.1c0.3-1.4,0.7-2.7,1-4c7.9-31.3,16.9-66.7-13.1-100.3c-4.3-4.8-11.7-5.2-16.5-0.9
+			c-4.8,4.3-5.2,11.7-0.9,16.5c21.7,24.3,15.3,49.6,7.9,79c-1.6,6.1-3.2,12.5-4.5,18.9c-0.7,3.4,0.1,7,2.3,9.7
+			c2.2,2.7,5.5,4.3,9,4.4l20.5,0.2C211.6,261.5,211.6,261.5,211.7,261.5z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000082340405703734207570000000804376882702522284_" gradientUnits="userSpaceOnUse" x1="-4964.7266" y1="232.7212" x2="-4964.7266" y2="153.0638" gradientTransform="matrix(-1 0 0 1 -4813.5654 0)">
+			<stop  offset="0.5767" style="stop-color:#7F52FF"/>
+			<stop  offset="1" style="stop-color:#4724C6"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000082340405703734207570000000804376882702522284_);" d="M157.8,261.5c6.4,0,11.6-5.2,11.7-11.6
+			c0.1-6.5-5.1-11.7-11.6-11.8l-2,0c17-34.2,31.5-76.2,12.2-105.1c-3.6-5.4-10.8-6.8-16.2-3.3c-5.4,3.6-6.8,10.8-3.3,16.2
+			c11.5,17.3,4,50.3-22.3,98c-2,3.6-1.9,8,0.1,11.5c2.1,3.6,5.9,5.7,10,5.8l21.2,0.2C157.8,261.5,157.8,261.5,157.8,261.5z"/>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_00000026150815805216787790000009724548987523338115_" gradientUnits="userSpaceOnUse" x1="21.2692" y1="84.9925" x2="119.4166" y2="84.9925">
+				<stop  offset="0.5767" style="stop-color:#7F52FF"/>
+				<stop  offset="1" style="stop-color:#4724C6"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000026150815805216787790000009724548987523338115_);" d="M107.7,127.4c-1.6,0-3.2-0.3-4.8-1
+				c-1-0.5-25.8-11.8-40.1-43.5c-3.7-8.3-9.6-13.6-17.5-15.8c-5.7-1.6-10.5-1-10.6-1c-6.4,1-12.4-3.3-13.4-9.7
+				C20.4,50,24.8,44,31.1,43c12.7-2,40.1,1.8,53,30.3c4.4,9.7,10.4,18,18.1,24.6c5.8,5,10.3,7.2,10.4,7.2c5.9,2.6,8.5,9.5,5.9,15.4
+				C116.5,124.8,112.2,127.4,107.7,127.4z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_00000085235707796469008110000003865732176341553801_" gradientUnits="userSpaceOnUse" x1="34.2162" y1="521.0145" x2="-50.355" y2="551.7247" gradientTransform="matrix(0.985 -0.1726 0.1726 0.985 208.5684 -409.9326)">
+				<stop  offset="0.5767" style="stop-color:#7F52FF"/>
+				<stop  offset="1" style="stop-color:#4724C6"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000085235707796469008110000003865732176341553801_);" d="M265.3,155c-5.5,0.4-10.6-3-12.2-8.5
+				c-1.7-6.2,1.9-12.7,8.1-14.4c0.7-0.2,18.9-5.8,32.6-27.3c11.5-18,28-23.6,41.3-24.1c8-0.3,13.9,7.4,11.5,15.1v0
+				c-1.5,4.7-5.8,8.1-10.7,8.2c-6.5,0.2-15.6,2.7-22.4,13.4c-18.7,29.2-44.9,36.8-46,37.2C266.7,154.8,266,154.9,265.3,155z"/>
+		</g>
+		<g>
+			<g>
+				
+					<linearGradient id="SVGID_00000055699488050613961070000015174867522107571643_" gradientUnits="userSpaceOnUse" x1="174.5708" y1="105.2515" x2="260.9491" y2="27.3646">
+					<stop  offset="0" style="stop-color:#7F52FF"/>
+					<stop  offset="0.4561" style="stop-color:#7D50FD"/>
+					<stop  offset="0.6512" style="stop-color:#764BF6"/>
+					<stop  offset="0.7964" style="stop-color:#6A40E9"/>
+					<stop  offset="0.9161" style="stop-color:#5832D8"/>
+					<stop  offset="1" style="stop-color:#4724C6"/>
+				</linearGradient>
+				<path style="fill:url(#SVGID_00000055699488050613961070000015174867522107571643_);" d="M244.2,174.4l-133-24.2
+					c-10.4-1.9-17.2-11.8-15.3-22.2L115,22.9c3.1-16.8,24-23,35.7-10.4l41.5,44.6c2.4,2.5,6.1,3.2,9.2,1.7l54.4-27.1
+					c15.3-7.6,32.8,5.5,29.7,22.3l-19.1,105.1C264.5,169.5,254.5,176.3,244.2,174.4z"/>
+			</g>
+			<g>
+				<g>
+					<g>
+						<path d="M121.7,138l114.6,21.7c8,1.5,15.6-3.8,17.1-11.8l9.7-53.7c1.5-8-3.8-15.6-11.8-17.1L136.7,55.4
+							c-8-1.5-15.6,3.8-17.1,11.8l-9.7,53.7C108.5,128.9,113.8,136.6,121.7,138z"/>
+					</g>
+				</g>
+				<g>
+					<g>
+						<path class="st9" d="M219,93.8c1.1,0,2.3,0.1,3.4,0.3c9.2,1.7,15.4,10.6,13.7,19.8c-1.4,7.9-8.3,13.8-16.4,14
+							c-1.1,0-2.3-0.1-3.4-0.3c-4.5-0.8-8.4-3.3-11-7.1c-2.6-3.7-3.6-8.3-2.8-12.7C204,99.8,210.9,93.9,219,93.8 M218.8,84.3
+							c-12.3,0.2-23.2,9.1-25.5,21.8c-2.6,14.4,6.9,28.2,21.3,30.8c1.8,0.3,3.5,0.5,5.3,0.4c12.3-0.2,23.2-9.1,25.5-21.8
+							c2.6-14.4-6.9-28.2-21.3-30.8C222.3,84.4,220.5,84.3,218.8,84.3L218.8,84.3z"/>
+					</g>
+					<g>
+						<path class="st9" d="M157.5,82.7L157.5,82.7c1.1,0,2.3,0.1,3.4,0.3c9.2,1.7,15.4,10.6,13.7,19.8c-1.4,7.9-8.3,13.8-16.4,14
+							c-1.1,0-2.3-0.1-3.4-0.3c-4.5-0.8-8.4-3.3-11-7.1c-2.6-3.7-3.6-8.3-2.8-12.7C142.6,88.7,149.5,82.8,157.5,82.7 M157.3,73.2
+							c-12.3,0.2-23.2,9.1-25.5,21.8c-2.6,14.4,6.9,28.2,21.3,30.8c1.8,0.3,3.5,0.5,5.3,0.4c12.3-0.2,23.2-9.1,25.5-21.8
+							c2.6-14.4-6.9-28.2-21.3-30.8C160.8,73.3,159.1,73.2,157.3,73.2L157.3,73.2z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+	<path class="st10" d="M223.3,24.5c0,0,21.4-4.6,33.2,11.6c11.8,16.2,17.7,34.7,42.7,35.3l54.3-21.2c0,0-26-6.4-40.8-36.1
+		c-8.2-16.4-24-15.2-30.7-12.6L223.3,24.5z"/>
+	<g class="st11">
+		<g>
+			<path class="st12" d="M94.5,211.3c-0.5,0-1.1-0.3-1.3-0.8l-15-29.5c-0.4-0.7-0.1-1.6,0.7-2c0.7-0.4,1.6-0.1,2,0.7l15,29.5
+				c0.4,0.7,0.1,1.6-0.7,2C94.9,211.2,94.7,211.3,94.5,211.3z"/>
+		</g>
+		<g>
+			<path class="st12" d="M84.5,212.8c-0.5,0-1.1-0.3-1.3-0.8l-15-29.5c-0.4-0.7-0.1-1.6,0.7-2c0.7-0.4,1.6-0.1,2,0.7l15,29.5
+				c0.4,0.7,0.1,1.6-0.7,2C85,212.8,84.7,212.8,84.5,212.8z"/>
+		</g>
+		<g>
+			<path class="st12" d="M74.2,214.6c-0.5,0-1.1-0.3-1.3-0.8l-15-29.5c-0.4-0.7-0.1-1.6,0.7-2c0.7-0.4,1.6-0.1,2,0.7l15,29.5
+				c0.4,0.7,0.1,1.6-0.7,2C74.7,214.5,74.5,214.6,74.2,214.6z"/>
+		</g>
+	</g>
+	<path class="st13" d="M326.4,246.8c0,0-13.9-11.1-31.1-14.2c-16-2.9-30.7,3.8-43.3-1c-24-9.3-30.3-21-30.3-21l22.2-64.2
+		c0,0,13.5,18.4,30.8,21.1c13.7,2.2,27.3-3.1,43.1,0c17,3.3,30.7,15,30.7,15L326.4,246.8z"/>
+	<path class="st13" d="M161.8,210.6c0,0-16.6-2.8-31.9,10.1s-28.5,22.8-53,17.4l-47.7-33.6c0,0,29.7,7.8,55.9-12.6
+		c12.9-10.1,28.4-15.4,34.3-11.2L161.8,210.6z"/>
+	
+		<linearGradient id="SVGID_00000124880864638424635450000005416435536009572777_" gradientUnits="userSpaceOnUse" x1="214.1582" y1="161.755" x2="243.069" y2="167.9906">
+		<stop  offset="0" style="stop-color:#7F52FF"/>
+		<stop  offset="0.4561" style="stop-color:#7D50FD"/>
+		<stop  offset="0.6512" style="stop-color:#764BF6"/>
+		<stop  offset="0.7964" style="stop-color:#6A40E9"/>
+		<stop  offset="0.9161" style="stop-color:#5832D8"/>
+		<stop  offset="1" style="stop-color:#4724C6"/>
+	</linearGradient>
+	<polygon style="fill:url(#SVGID_00000124880864638424635450000005416435536009572777_);" points="239.2,160 217.6,156.2 
+		216.3,169.4 234.8,172.7 	"/>
+	
+		<linearGradient id="SVGID_00000026882719541233535210000008541562331978929325_" gradientUnits="userSpaceOnUse" x1="151.4674" y1="227.203" x2="144.3418" y2="211.0084">
+		<stop  offset="0.3158" style="stop-color:#7F52FF"/>
+		<stop  offset="0.5199" style="stop-color:#7C4FFC"/>
+		<stop  offset="0.6872" style="stop-color:#7247F2"/>
+		<stop  offset="0.8415" style="stop-color:#6139E0"/>
+		<stop  offset="0.9871" style="stop-color:#4926C9"/>
+		<stop  offset="1" style="stop-color:#4724C6"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000026882719541233535210000008541562331978929325_);" d="M161.8,210.6l-8.1,27.5l-19.3-9.5
+		l8.1-15.3C142.5,213.2,154.7,209.1,161.8,210.6z"/>
+	<g class="st11">
+		<g>
+			<path class="st12" d="M257.1,23.3c-0.6,0-1.2-0.4-1.4-0.9c-0.3-0.8,0.1-1.6,0.8-2l34.6-14.1c0.8-0.3,1.6,0.1,2,0.8
+				c0.3,0.8-0.1,1.6-0.8,2l-34.6,14.1C257.5,23.3,257.3,23.3,257.1,23.3z"/>
+		</g>
+		<g>
+			<path class="st12" d="M265.8,30.4c-0.6,0-1.2-0.4-1.4-0.9c-0.3-0.8,0.1-1.6,0.8-2l34.6-14.1c0.8-0.3,1.6,0.1,2,0.8
+				c0.3,0.8-0.1,1.6-0.8,2l-34.6,14.1C266.1,30.3,265.9,30.4,265.8,30.4z"/>
+		</g>
+		<g>
+			<path class="st12" d="M272.2,40.2c-0.6,0-1.2-0.4-1.4-0.9c-0.3-0.8,0.1-1.6,0.8-2l34.6-14.1c0.8-0.3,1.6,0.1,2,0.8
+				c0.3,0.8-0.1,1.6-0.8,2l-34.6,14.1C272.6,40.2,272.4,40.2,272.2,40.2z"/>
+		</g>
+	</g>
+	<g class="st11">
+		<path class="st12" d="M252.3,209.4l-2.6,8.5l-4.8-1.5l-8.5-10.4l1.1-3.7l9.2,11.2l1,0.3l1.6-5.4l-4.4-1.3l1-3.3l11.1,3.4l-1,3.3
+			L252.3,209.4z"/>
+		<path class="st12" d="M252.9,201.3l-8.3-2.5c-3.5-1.1-5-4.1-3.9-7.9c1.1-3.8,4.1-5.4,7.6-4.4l8.3,2.5c3.5,1.1,5,4.1,3.9,7.9
+			C259.4,200.7,256.4,202.4,252.9,201.3z M255.7,192.2l-8.3-2.5c-1.7-0.5-3.3,0.3-3.8,2.1c-0.6,1.9,0.2,3.4,2,3.9l8.3,2.5
+			c1.7,0.5,3.3-0.3,3.8-2.1C258.2,194.2,257.4,192.7,255.7,192.2z M250,195.6c-1.1-0.3-1.4-1.2-1.1-2.2c0.3-1.1,1.1-1.6,2.1-1.3
+			c1.1,0.3,1.5,1.2,1.1,2.3C251.9,195.5,251.1,196,250,195.6z"/>
+		<path class="st12" d="M261.9,177.6l-2.6,8.5l-4.8-1.5l-8.5-10.4l1.1-3.7l9.2,11.2l1,0.3l1.6-5.4l-4.4-1.3l1-3.3l11.1,3.4l-1,3.3
+			L261.9,177.6z"/>
+	</g>
+	<g>
+		<path class="st9" d="M191.1,133.3c-0.1,0-0.3,0-0.4,0l-13.4-2.7c-1.1-0.2-1.8-1.3-1.6-2.4c0.2-1.1,1.3-1.8,2.4-1.6l13.4,2.7
+			c1.1,0.2,1.8,1.3,1.6,2.4C192.9,132.6,192,133.3,191.1,133.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/static/css/com/page-content/page-content.scss b/static/css/com/page-content/page-content.scss
index 40db5d44c99..f7925c37ce7 100644
--- a/static/css/com/page-content/page-content.scss
+++ b/static/css/com/page-content/page-content.scss
@@ -100,8 +100,8 @@
     }
 
     ._error-404 {
-        width: 250px;
-        height: 250px;
-        background-image: url("../layout/images/icon_404.svg");
+        width: 355px;
+        height: 262px;
+        background-image: url("../layout/images/mascot-404.svg");
     }
 }
diff --git a/static/js/ktl-component/teach/index.jsx b/static/js/ktl-component/teach/index.jsx
index 9c0e6c4fe39..deea8c50557 100644
--- a/static/js/ktl-component/teach/index.jsx
+++ b/static/js/ktl-component/teach/index.jsx
@@ -215,7 +215,9 @@ const Teach = (props) => {
                                   <a href="mailto:education@kotlinlang.org" className="rs-link">
                                       education@kotlinlang.org.
                                   </a>
-                                  <br />We’ll send you a Kotlin T-shirt and stickers for your students.
+                                  {' '}
+                                  <br />
+                                  We’ll send you a Kotlin T-shirt and stickers for your students.
                               </p>
                               <Button size="l" mode="outline" href="courses.html">
                                   All universities
diff --git a/yarn.lock b/yarn.lock
index 3f6617b906c..6b90f68ca1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1233,10 +1233,10 @@
     "@babel/runtime" "^7.14.0"
     babel-plugin-angularjs-annotate "^0.10.0"
 
-"@jetbrains/kotlin-web-site-ui@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@jetbrains/kotlin-web-site-ui/-/kotlin-web-site-ui-4.5.1.tgz#59356c2d2999002b16c61920f239fe4bf74d9068"
-  integrity sha512-DqciJmN4B/goivq904VXMA4aQ6elk6EMko3gv7ROcQ/FNfj+hFNSZrV5R0XmtlkHIvdHc/0b3x+oHw5ADGGnfA==
+"@jetbrains/kotlin-web-site-ui@4.7.1":
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/@jetbrains/kotlin-web-site-ui/-/kotlin-web-site-ui-4.7.1.tgz#f97a5ef81d7f994358702bdd6a25a7392f462fb2"
+  integrity sha512-79bKic+Ni27tMn7di80/sShZQuPJYED0rCNwkd5oeaBnGnQxGGjQXJHLpcNKESH5fabIFHwcQQGVDEelXQkjeA==
 
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
@@ -2080,22 +2080,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.0.4":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
+"@webpack-cli/configtest@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
+  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
 
-"@webpack-cli/info@^1.3.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
-  dependencies:
-    envinfo "^7.7.3"
+"@webpack-cli/info@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
+  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
 
-"@webpack-cli/serve@^1.5.1":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
+"@webpack-cli/serve@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
+  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -3142,12 +3140,12 @@ color@^3.1.2:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
-colorette@^1.2.1, colorette@^1.3.0:
+colorette@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
   integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
-colorette@^2.0.10:
+colorette@^2.0.10, colorette@^2.0.14:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
@@ -3159,12 +3157,17 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -3791,9 +3794,9 @@ env-paths@^2.2.0:
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
+  integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
 
 err-code@^2.0.2:
   version "2.0.3"
@@ -5079,10 +5082,10 @@ internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
@@ -5177,6 +5180,13 @@ is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+  dependencies:
+    has "^1.0.3"
+
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -7076,12 +7086,12 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
 redent@^3.0.0:
   version "3.0.0"
@@ -7288,7 +7298,7 @@ resolve-url-loader@4.0.0:
     postcss "^7.0.35"
     source-map "0.6.1"
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.3.3:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -7297,6 +7307,15 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.3
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.20.0:
+  version "1.22.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
+  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.4:
   version "2.0.0-next.4"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
@@ -8465,7 +8484,7 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
+v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -8530,23 +8549,23 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webpack-cli@4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
-  integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
+webpack-cli@5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
+  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.0.4"
-    "@webpack-cli/info" "^1.3.0"
-    "@webpack-cli/serve" "^1.5.1"
-    colorette "^1.2.1"
-    commander "^7.0.0"
-    execa "^5.0.0"
+    "@webpack-cli/configtest" "^2.1.1"
+    "@webpack-cli/info" "^2.0.2"
+    "@webpack-cli/serve" "^2.0.5"
+    colorette "^2.0.14"
+    commander "^10.0.1"
+    cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
-    v8-compile-cache "^2.2.0"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
 webpack-dev-middleware@^5.2.1: