diff --git a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar and b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/_gradleCompositeBuild/gradlew b/code_samples/_gradleCompositeBuild/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/_gradleCompositeBuild/gradlew
+++ b/code_samples/_gradleCompositeBuild/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/action_basics/gradlew b/code_samples/action_basics/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/action_basics/gradlew
+++ b/code_samples/action_basics/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar and b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/comparing_string_references_inspection/gradlew b/code_samples/comparing_string_references_inspection/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/comparing_string_references_inspection/gradlew
+++ b/code_samples/comparing_string_references_inspection/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar and b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/conditional_operator_intention/gradlew b/code_samples/conditional_operator_intention/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/conditional_operator_intention/gradlew
+++ b/code_samples/conditional_operator_intention/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/editor_basics/gradlew b/code_samples/editor_basics/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/editor_basics/gradlew
+++ b/code_samples/editor_basics/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/facet_basics/gradlew b/code_samples/facet_basics/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/facet_basics/gradlew
+++ b/code_samples/facet_basics/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/framework_basics/gradlew b/code_samples/framework_basics/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/framework_basics/gradlew
+++ b/code_samples/framework_basics/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar and b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/live_templates/gradlew b/code_samples/live_templates/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/live_templates/gradlew
+++ b/code_samples/live_templates/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar and b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/max_opened_projects/gradlew b/code_samples/max_opened_projects/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/max_opened_projects/gradlew
+++ b/code_samples/max_opened_projects/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/module/gradle/wrapper/gradle-wrapper.jar b/code_samples/module/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/module/gradle/wrapper/gradle-wrapper.jar and b/code_samples/module/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/module/gradle/wrapper/gradle-wrapper.properties b/code_samples/module/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/module/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/module/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/module/gradlew b/code_samples/module/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/module/gradlew
+++ b/code_samples/module/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/product_specific/pycharm_basics/gradlew b/code_samples/product_specific/pycharm_basics/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/product_specific/pycharm_basics/gradlew
+++ b/code_samples/product_specific/pycharm_basics/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_model/gradlew b/code_samples/project_model/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/project_model/gradlew
+++ b/code_samples/project_model/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_view_pane/gradlew b/code_samples/project_view_pane/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/project_view_pane/gradlew
+++ b/code_samples/project_view_pane/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_wizard/gradlew b/code_samples/project_wizard/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/project_wizard/gradlew
+++ b/code_samples/project_wizard/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar and b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/psi_demo/gradlew b/code_samples/psi_demo/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/psi_demo/gradlew
+++ b/code_samples/psi_demo/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar and b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/run_configuration/gradlew b/code_samples/run_configuration/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/run_configuration/gradlew
+++ b/code_samples/run_configuration/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/settings/gradle/wrapper/gradle-wrapper.jar b/code_samples/settings/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/settings/gradle/wrapper/gradle-wrapper.jar and b/code_samples/settings/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/settings/gradle/wrapper/gradle-wrapper.properties b/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/settings/gradlew b/code_samples/settings/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/settings/gradlew
+++ b/code_samples/settings/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar and b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/simple_language_plugin/gradlew b/code_samples/simple_language_plugin/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/simple_language_plugin/gradlew
+++ b/code_samples/simple_language_plugin/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar and b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/tool_window/gradlew b/code_samples/tool_window/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/tool_window/gradlew
+++ b/code_samples/tool_window/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..9bbc975c7 100644
Binary files a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar and b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..37f853b1c 100644
--- a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/tree_structure_provider/gradlew b/code_samples/tree_structure_provider/gradlew
index f3b75f3b0..faf93008b 100755
--- a/code_samples/tree_structure_provider/gradlew
+++ b/code_samples/tree_structure_provider/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.