diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
index 9d775f8f317..2c5b6f910fa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
@@ -21,8 +21,8 @@ import com.intellij.compiler.server.BuildProcessParametersProvider
 public class KotlinBuildProcessParametersProvider(private val compilerWorkspaceSettings: KotlinCompilerWorkspaceSettings): BuildProcessParametersProvider() {
     override fun getVMArguments(): MutableList<String> {
         return if (compilerWorkspaceSettings.incrementalCompilationEnabled)
-            arrayListOf("-Dkotlin.incremental.compilation=true")
-        else
             arrayListOf()
+        else
+            arrayListOf("-Dkotlin.incremental.compilation=false")
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index 0509758e35f..89df33344a4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -27,7 +27,7 @@
             </constraints>
             <properties>
               <selected value="false"/>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
             </properties>
           </component>
           <component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel">
@@ -35,7 +35,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
             </properties>
           </component>
           <component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -45,7 +45,7 @@
               </grid>
             </constraints>
             <properties>
-              <dialogCaption resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
+              <dialogCaption resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
             </properties>
           </component>
         </children>
@@ -61,14 +61,14 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org.jetbrains.kotlin.idea/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
         <children>
           <component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Enable incremental compilation (experimental)"/>
+              <text value="Enable incremental compilation"/>
             </properties>
           </component>
         </children>
@@ -84,14 +84,14 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org.jetbrains.kotlin.idea/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
         <children>
           <component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
             </properties>
           </component>
           <component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile">
@@ -101,7 +101,7 @@
               </grid>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
             </properties>
           </component>
           <component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile">
@@ -117,7 +117,7 @@
               </grid>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
             </properties>
           </component>
           <component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile">
@@ -131,7 +131,7 @@
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
             </properties>
           </component>
           <component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory">
@@ -149,7 +149,7 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
+              <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
index 7572e72b883..ad1613d647f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
@@ -29,7 +29,7 @@ State(
         )
 )
 public class KotlinCompilerWorkspaceSettings() : PersistentStateComponent<KotlinCompilerWorkspaceSettings> {
-    public var incrementalCompilationEnabled: Boolean = false
+    public var incrementalCompilationEnabled: Boolean = true
 
     override fun getState(): KotlinCompilerWorkspaceSettings {
         return this