diff --git a/buildSrc/src/main/kotlin/buildProperties.kt b/buildSrc/src/main/kotlin/buildProperties.kt
index bc157d0802e..31128db4fdc 100644
--- a/buildSrc/src/main/kotlin/buildProperties.kt
+++ b/buildSrc/src/main/kotlin/buildProperties.kt
@@ -52,10 +52,10 @@ class KotlinBuildProperties(
         get() = isJpsBuildEnabled && isInIdeaSync
 
     val includeJava9: Boolean
-        get() = !isInJpsBuildIdeaSync
+        get() = !isInJpsBuildIdeaSync && getBoolean("kotlin.build.java9", true)
 
     val useBootstrapStdlib: Boolean
-        get() = isInJpsBuildIdeaSync
+        get() = isInJpsBuildIdeaSync || getBoolean("kotlin.build.useBootstrapStdlib", false)
 
     val kotlinUltimateExists: Boolean = propertiesProvider.rootProjectDir.resolve("kotlin-ultimate").exists()
 
diff --git a/gradle.properties b/gradle.properties
index bc7cd141117..bd0786dd919 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,9 @@ kotlin.compiler.newInferenceEnabled=true
 
 #jpsBuild=true
 #cidrPluginsEnabled=true
+
+## Used for compare gradle and jps build
+
+#kotlin.build.postprocessing=false
+#kotlin.build.java9=false
+#kotlin.build.useBootstrapStdlib=true
\ No newline at end of file
diff --git a/gradle.properties.as33 b/gradle.properties.as33
index 0ebec85453a..3530b13c2e9 100644
--- a/gradle.properties.as33
+++ b/gradle.properties.as33
@@ -10,3 +10,14 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
+
+## The following properties can be added to your local.properties file to customize the build:
+
+#jpsBuild=true
+#cidrPluginsEnabled=true
+
+## Used for compare gradle and jps build
+
+#kotlin.build.postprocessing=false
+#kotlin.build.java9=false
+#kotlin.build.useBootstrapStdlib=true
\ No newline at end of file
diff --git a/gradle.properties.as34 b/gradle.properties.as34
index 0ebec85453a..3530b13c2e9 100644
--- a/gradle.properties.as34
+++ b/gradle.properties.as34
@@ -10,3 +10,14 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
+
+## The following properties can be added to your local.properties file to customize the build:
+
+#jpsBuild=true
+#cidrPluginsEnabled=true
+
+## Used for compare gradle and jps build
+
+#kotlin.build.postprocessing=false
+#kotlin.build.java9=false
+#kotlin.build.useBootstrapStdlib=true
\ No newline at end of file
diff --git a/gradle.properties.as35 b/gradle.properties.as35
index d5407a7a888..a14f118a680 100644
--- a/gradle.properties.as35
+++ b/gradle.properties.as35
@@ -10,4 +10,15 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
\ No newline at end of file
+intellijEnforceCommunitySdk=true
+
+## The following properties can be added to your local.properties file to customize the build:
+
+#jpsBuild=true
+#cidrPluginsEnabled=true
+
+## Used for compare gradle and jps build
+
+#kotlin.build.postprocessing=false
+#kotlin.build.java9=false
+#kotlin.build.useBootstrapStdlib=true
\ No newline at end of file
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 327aef3e02c..1390fdd8295 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -44,10 +44,13 @@ val compilerPlugins by configurations.creating  {
 
 val sources by configurations.creating {
     exclude("org.jetbrains.kotlin", "kotlin-stdlib-common")
+    isTransitive = false
 }
 
 // contents of dist/maven directory
-val distMavenContents by configurations.creating
+val distMavenContents by configurations.creating {
+    isTransitive = false
+}
 // contents of dist/common directory
 val distCommonContents by configurations.creating
 val distStdlibMinimalForTests by configurations.creating
@@ -337,5 +340,6 @@ inline fun <reified T : AbstractCopyTask> Project.distTask(
 ) = tasks.register<T>(name) {
     duplicatesStrategy = DuplicatesStrategy.FAIL
     rename(quote("-$version"), "")
+    rename(quote("-$bootstrapKotlinVersion"), "")
     block()
 }
\ No newline at end of file
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 008bf795c9c..aafcc9b4cd6 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -174,4 +174,5 @@ tasks.register<Sync>("ideaPlugin") {
     }
 
     rename(quote("-$version"), "")
+    rename(quote("-$bootstrapKotlinVersion"), "")
 }