diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt
index 0d520d55d84..557a3e82718 100644
--- a/buildSrc/src/main/kotlin/localDependencies.kt
+++ b/buildSrc/src/main/kotlin/localDependencies.kt
@@ -24,7 +24,9 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.DependencyHandlerScope
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.register
 import java.io.File
 
 private fun Project.kotlinBuildLocalDependenciesDir(): File =
@@ -172,6 +174,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
             "-XX:ReservedCodeCacheSize=240m",
             "-XX:+HeapDumpOnOutOfMemoryError",
             "-ea",
+            "-Didea.platform.prefix=Idea",
             "-Didea.debug.mode=true",
             "-Didea.system.path=$ideaSandboxDir",
             "-Didea.config.path=$ideaSandboxConfigDir",
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 42dfdc1bf91..b850ef4c6a3 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -169,6 +169,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
                                     "-XX:ReservedCodeCacheSize=240m",
                                     "-XX:+HeapDumpOnOutOfMemoryError",
                                     "-ea",
+                                    "-Didea.platform.prefix=Idea",
                                     "-Didea.is.internal=true",
                                     "-Didea.debug.mode=true",
                                     "-Didea.system.path=${sandboxDir.absolutePath}",
diff --git a/gradle/versions.properties.201 b/gradle/versions.properties.201
index 2cddd545237..1b5c3b21a64 100644
--- a/gradle/versions.properties.201
+++ b/gradle/versions.properties.201
@@ -1,4 +1,4 @@
-versions.intellijSdk=201.6251.22-EAP-SNAPSHOT
+versions.intellijSdk=201.6487-EAP-CANDIDATE-SNAPSHOT
 versions.androidBuildTools=r23.0.1
 versions.idea.NodeJS=193.6494.7
 versions.jar.asm-all=7.0.1
diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources/META-INF/plugin.xml.201
index dd0eb3f8df2..fcb482b1b27 100644
--- a/idea/resources/META-INF/plugin.xml.201
+++ b/idea/resources/META-INF/plugin.xml.201
@@ -13,7 +13,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains</vendor>
 
-  <idea-version since-build="201.5985.32" until-build="202.*"/>
+  <idea-version since-build="201.6487" until-build="202.*"/>
 
   <depends>com.intellij.modules.platform</depends>