diff --git a/build.gradle.kts b/build.gradle.kts
index 5eeb764b13a..2c085063e6e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -128,6 +128,9 @@ extra["versions.kotlinx-coroutines-jdk8"] = "0.14.1"
 extra["versions.json"] = "20160807"
 extra["versions.native-platform"] = "0.14"
 
+val markdownVer =  "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin"
+extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])"
+
 // the former "ideaSdk/core" dir contents without intellij-core.jar
 extra["IntellijCoreDependencies"] =
         listOf("annotations.jar",
@@ -274,6 +277,9 @@ allprojects {
         for (repo in (rootProject.extra["repos"] as List<String>)) {
             maven { setUrl(repo) }
         }
+        ivy {
+            artifactPattern(rootProject.extra["markdownParserRepo"] as String)
+        }
     }
     configureJvmProject(javaHome!!, jvmTarget!!)
 
diff --git a/gradle/project-schema.json b/gradle/project-schema.json
index 9b5d9558510..f803bfa5974 100644
--- a/gradle/project-schema.json
+++ b/gradle/project-schema.json
@@ -1032,6 +1032,7 @@
             "compileOnly",
             "default",
             "distJar",
+            "fatJarContents",
             "implementation",
             "kapt",
             "kaptTest",
@@ -2172,6 +2173,8 @@
             "compileClasspath",
             "compileOnly",
             "default",
+            "idea",
+            "ideaPlugins",
             "implementation",
             "kapt",
             "kaptTest",
@@ -2193,7 +2196,8 @@
             "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
             "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
             "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
         }
     },
     ":compiler:android-tests": {
@@ -3300,13 +3304,28 @@
             
         },
         "configurations": [
+            "archives",
             "default",
-            "relocated",
-            "shadow"
+            "relocatedProtobuf",
+            "relocatedProtobufSources"
         ],
         "extensions": {
-            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
-            "shadow": "com.github.jengelman.gradle.plugins.shadow.ShadowExtension"
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
+        }
+    },
+    ":custom-dependencies:protobuf-relocated": {
+        "conventions": {
+            
+        },
+        "configurations": [
+            "archives",
+            "baseProtobuf",
+            "baseProtobufSources",
+            "default",
+            "sources"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
         }
     },
     ":examples:annotation-processor-example": {
@@ -4571,6 +4590,8 @@
             "compileClasspath",
             "compileOnly",
             "default",
+            "idea",
+            "ideaPlugins",
             "implementation",
             "kapt",
             "kaptTest",
@@ -4592,7 +4613,8 @@
             "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
             "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
             "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
         }
     },
     ":plugins:annotation-based-compiler-plugins-ide-support": {
@@ -5032,6 +5054,8 @@
             "compileClasspath",
             "compileOnly",
             "default",
+            "idea",
+            "ideaPlugins",
             "implementation",
             "kapt",
             "kaptTest",
@@ -5052,7 +5076,8 @@
             "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
             "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
             "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
         }
     },
     ":kotlin-test:kotlin-test-js:kotlin-test-js-it": {
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index c5b44858cc6..0daccd69f41 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     compile(project(":kotlin-script-util")) { isTransitive = false }
 
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
-    compile(preloadedDeps("markdown"))
+    compile("teamcity:markdown")
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 9a1fb664941..66bdf621b80 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -73,7 +73,7 @@ dependencies {
     sideJars(commonDep("javax.inject"))
     sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
-    sideJars(preloadedDeps("markdown"))
+    sideJars("teamcity:markdown")
 }
 
 val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 15088fd1019..3fe29a85b88 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -8,8 +8,6 @@
     <property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS${kotlin.bootstrap.branch.locator}"/>
     <property name="kotlin.bootstrap.locator.force" value="false"/>
 
-    <property name="markdown.locator" value="buildType:IntelliJMarkdownParser_Build,status:SUCCESS,tag:forKotlin"/>
-
     <property name="bootstrap.build.no.tests" value="false"/>
 
     <!-- Uncomment to enable force version increment in branch. Set override.version.disabled to temporary disable feature without commits -->
@@ -202,6 +200,8 @@
             build.number.pattern="\d+\s-\sKotlin\s[\w-+\.]+"
         />
 
+        <!-- node.js -->
+        <antcall target="download-nodejs-and-npm"/>
     </target>
 
     <macrodef name="download_teamcity_artifact">