diff --git a/build/conf/ideaCE-launcher.properties b/build/conf/ideaCE-launcher.properties
index 447e5e48859a..bb8259af9757 100644
--- a/build/conf/ideaCE-launcher.properties
+++ b/build/conf/ideaCE-launcher.properties
@@ -5,4 +5,4 @@ IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
diff --git a/build/conf/ideaCE64-launcher.properties b/build/conf/ideaCE64-launcher.properties
index 03fe514c2f16..ba9686fa0fbf 100644
--- a/build/conf/ideaCE64-launcher.properties
+++ b/build/conf/ideaCE64-launcher.properties
@@ -6,4 +6,4 @@ IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME__64_VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index 6a9ace9f0666..6a324604b6ce 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -70,6 +70,7 @@ def loadProductProperties(String home, String buildNumber) {
     throw new BuildException("No product specific properties file found at: " + productPropertiesPath)
   }
   setProperty("productProperties", includeFile(productPropertiesPath).getProperties(home, buildNumber))
+  productProperties.ideJvmArgs = productProperties.ideJvmArgs + " -Didea.jre.check=true"
 }
 
 target(compile: "Compile project") {
@@ -265,6 +266,7 @@ private layoutMac(Map _args, String home, Paths paths) {
       </dict>
 """
   args."idea.properties.path" = "${paths.distAll}/bin/idea.properties"
+  args."idea.properties" = ["idea.jre.check": true];
   args.urlSchemes = ["idea"]
   args.mac_no_yjp = true
   args.executable = prefix
diff --git a/build/scripts/nsis_installer.gant b/build/scripts/nsis_installer.gant
index cba236ad6625..1d714667a92b 100644
--- a/build/scripts/nsis_installer.gant
+++ b/build/scripts/nsis_installer.gant
@@ -22,12 +22,9 @@ def nsis_installer(pathsToInclude, stringsFile, pathsFile, outNamePrefix, includ
   ant.mkdir(dir: "$box/nsiconf")
 
   if (!hasBundledJRE) {
-    ant.mkdir(dir: "$box/jre")
-    ant.unzip(dest: "$box/jre", src: winJDK)
-
     ant.copy(todir: "$box/bin") {
-      fileset(dir: "$box/jre/jre/bin") {
-        include(name: "msvcr71.dll")
+      fileset(dir: "${box}/jdk.win/jre") {
+        include(name: "**/msvcr71.dll")
       }
     }
   }
@@ -60,12 +57,7 @@ def nsis_installer(pathsToInclude, stringsFile, pathsFile, outNamePrefix, includ
     }
     fileset(dir: box, includes: "bin/msvcr71.dll")
     if (!hasBundledJRE) {
-      fileset(dir: box, includes: "jre/**/*")
-      if (includeToolsJar) {
-        fileset(dir: box) {
-          include(name: "jre/lib/tools.jar")
-        }
-      }
+      fileset(dir: "${box}/jdk.win", includes: "jre/**/*")
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 8fe38cda86fa..2fc4fcbeb05b 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -145,7 +145,8 @@ public class StartupUtil {
    * Checks if the program can run under the JDK it was started with.
    */
   private static boolean checkJdkVersion() {
-    if (!"true".equals(System.getProperty("idea.no.jre.check"))) {
+    String jreCheck = System.getProperty("idea.jre.check");
+    if (jreCheck != null && "true".equals(jreCheck)) {
       try {
         // try to find a class from tools.jar
         Class.forName("com.sun.jdi.Field", false, StartupUtil.class.getClassLoader());
@@ -169,8 +170,8 @@ public class StartupUtil {
         return false;
       }
     }
-
-    if (!"true".equals(System.getProperty("idea.no.64bit.check"))) {
+    jreCheck = System.getProperty("idea.64bit.check");
+    if (jreCheck != null && "true".equals(jreCheck)) {
       if (PlatformUtils.isCidr() && !SystemInfo.is64Bit) {
           String message = "32-bit JVM is not supported. Please install 64-bit version.";
           Main.showMessage("Unsupported JVM", message, true);
diff --git a/python/build/pycharm64_community_launcher.properties b/python/build/pycharm64_community_launcher.properties
index 11ca3241ed51..d36a1e725e37 100644
--- a/python/build/pycharm64_community_launcher.properties
+++ b/python/build/pycharm64_community_launcher.properties
@@ -6,4 +6,4 @@ IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME__64_VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.no.jre.check=true -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
diff --git a/python/build/pycharm_community_launcher.properties b/python/build/pycharm_community_launcher.properties
index 7827fb9d7991..e57a9dc5c334 100644
--- a/python/build/pycharm_community_launcher.properties
+++ b/python/build/pycharm_community_launcher.properties
@@ -6,4 +6,4 @@ IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.no.jre.check=true -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
diff --git a/python/educational-python/build/pycharm_edu_build.gant b/python/educational-python/build/pycharm_edu_build.gant
index a69c4d24b529..b309878290bf 100644
--- a/python/educational-python/build/pycharm_edu_build.gant
+++ b/python/educational-python/build/pycharm_edu_build.gant
@@ -171,7 +171,7 @@ public layoutEducational(String classesPath, Set usedJars) {
     projectBuilder.moduleRuntimeClasspath(findModule("main_pycharm_edu"), false).each {
       ant.pathelement(location: it)
     }
-  }, "-Didea.platform.prefix=PyCharmEdu -Didea.no.jre.check=true")
+  }, "-Didea.platform.prefix=PyCharmEdu")
 
   def appInfo = appInfoFile()
   if (!dryRun) {
@@ -181,7 +181,7 @@ public layoutEducational(String classesPath, Set usedJars) {
   Map args = [
     buildNumber: "PE-${buildNumber}",
     system_selector: system_selector,
-    ide_jvm_args: "-Didea.platform.prefix=PyCharmEdu -Didea.no.jre.check=true"]
+    ide_jvm_args: "-Didea.platform.prefix=PyCharmEdu"]
 
   LayoutInfo layoutInfo = layoutFull(args, paths.distAll, usedJars)
   generateLicensesTable("$paths.artifacts/third-party-libraries.txt", layoutInfo.usedModules);
@@ -439,7 +439,7 @@ private layoutMac(Map _args, String target) {
   args.platform_prefix = "PyCharmEdu"
   args.help_id = "PE"
   args."idea.properties.path" = "${paths.distAll}/bin/idea.properties"
-  args."idea.properties" = ["idea.no.jre.check": true, "ide.mac.useNativeClipboard": "false"];
+  args."idea.properties" = ["ide.mac.useNativeClipboard": "false"];
   args.executable = "pycharm"
   layoutMacApp(target, ch, args)
 }
diff --git a/python/educational-python/build/pycharm_edu_launcher.properties b/python/educational-python/build/pycharm_edu_launcher.properties
index 2ab88de78130..0149a3f09d1d 100644
--- a/python/educational-python/build/pycharm_edu_launcher.properties
+++ b/python/educational-python/build/pycharm_edu_launcher.properties
@@ -6,4 +6,4 @@ IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmEdu -Didea.no.jre.check=true -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmEdu -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__