diff --git a/.idea/libraries/proxy_vole.xml b/.idea/libraries/proxy_vole.xml
index 74a709c8cf82..6cb9a2e19b64 100644
--- a/.idea/libraries/proxy_vole.xml
+++ b/.idea/libraries/proxy_vole.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="proxy-vole">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/proxy-vole_20120920.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/proxy-vole_20131209.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
index b751ab59ba48..531087761da2 100644
--- a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
+++ b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
@@ -1,20 +1,21 @@
-/* The following code was generated by JFlex 1.4.3 on 10/24/14 12:41 PM */
+/* The following code was generated by JFlex 1.4.3 on 10/24/14 4:28 PM */
 
 /* It's an automatically generated code. Do not modify it. */
 package org.intellij.lang.regexp;
 
 import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-import java.util.LinkedList;
-import java.util.EnumSet;
 import com.intellij.psi.StringEscapesTokenTypes;
+import com.intellij.psi.tree.IElementType;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
 
 @SuppressWarnings("ALL")
 
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 10/24/14 12:41 PM from the specification file
+ * on 10/24/14 4:28 PM from the specification file
  * <tt>/Users/bas/Projects/IntelliJ IDEA Ultimate/tools/lexer/../../community/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex</tt>
  */
 class _RegExLexer implements FlexLexer {
@@ -404,12 +405,13 @@ class _RegExLexer implements FlexLexer {
 
   /* user code: */
     // This adds support for nested states. I'm no JFlex pro, so maybe this is overkill, but it works quite well.
-    private final LinkedList<Integer> states = new LinkedList();
+    private final ArrayList<Integer> states = new ArrayList();
 
     // This was an idea to use the regex implementation for XML schema regexes (which use a slightly different syntax)
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
     private boolean xmlSchemaMode;
 
+    private int capturingGroupCount = 0;
 
     private boolean allowDanglingMetacharacters;
     private boolean allowNestedCharacterClasses;
@@ -433,11 +435,12 @@ class _RegExLexer implements FlexLexer {
     }
 
     private void yypushstate(int state) {
-        states.addFirst(yystate());
+        states.add(yystate());
         yybegin(state);
     }
+
     private void yypopstate() {
-        final int state = states.removeFirst();
+        final int state = states.remove(states.size() - 1);
         yybegin(state);
     }
 
@@ -747,94 +750,85 @@ class _RegExLexer implements FlexLexer {
           { yybegin(YYINITIAL); return RegExpTT.GROUP_END;
           }
         case 88: break;
-        case 5: 
-          { return RegExpTT.GROUP_BEGIN;
-          }
-        case 89: break;
         case 37: 
           { yybegin(YYINITIAL); return RegExpTT.COLON;
           }
-        case 90: break;
+        case 89: break;
         case 6: 
           { return RegExpTT.GROUP_END;
           }
-        case 91: break;
+        case 90: break;
         case 25: 
           { assert false : yytext();
           }
-        case 92: break;
+        case 91: break;
         case 18: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER;
           }
-        case 93: break;
+        case 92: break;
         case 46: 
           { return commentMode ? RegExpTT.CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 94: break;
+        case 93: break;
         case 23: 
           { return RegExpTT.NAME;
           }
-        case 95: break;
-        case 74: 
-          { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
-                                return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
-          }
-        case 96: break;
+        case 94: break;
         case 29: 
           { yypopstate(); return RegExpTT.CLASS_END;
           }
-        case 97: break;
+        case 95: break;
         case 34: 
           { yybegin(YYINITIAL); return RegExpTT.BAD_CHARACTER;
           }
-        case 98: break;
+        case 96: break;
         case 52: 
           { yypushstate(QUOTED); return RegExpTT.QUOTE_BEGIN;
           }
-        case 99: break;
+        case 97: break;
         case 21: 
           { return RegExpTT.NUMBER;
           }
-        case 100: break;
+        case 98: break;
         case 4: 
           { return RegExpTT.DOT;
           }
-        case 101: break;
+        case 99: break;
         case 72: 
           { return RegExpTT.NEG_LOOKBEHIND;
           }
-        case 102: break;
+        case 100: break;
         case 33: 
           { yypopstate(); if (allowCategoryShorthand) return RegExpTT.CATEGORY_SHORT_HAND; else yypushback(1);
           }
-        case 103: break;
+        case 101: break;
         case 44: 
           { return (allowOctalNoLeadingZero ? RegExpTT.OCT_CHAR : RegExpTT.BAD_OCT_VALUE);
           }
-        case 104: break;
+        case 102: break;
         case 41: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
           { yypushstate(CLASS1);
                             return RegExpTT.CLASS_BEGIN;
           }
-        case 105: break;
+        case 103: break;
         case 63: 
           { return RegExpTT.NEG_LOOKAHEAD;
           }
-        case 106: break;
+        case 104: break;
         case 10: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER;
           }
-        case 107: break;
+        case 105: break;
         case 61: 
           { return RegExpTT.NON_CAPT_GROUP;
           }
-        case 108: break;
+        case 106: break;
         case 65: 
           { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP;
           }
-        case 109: break;
+        case 107: break;
         case 66: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
@@ -846,7 +840,7 @@ class _RegExLexer implements FlexLexer {
                               }
                               return RegExpTT.CLASS_BEGIN;
           }
-        case 110: break;
+        case 108: break;
         case 28: 
           { if (allowNestedCharacterClasses) {
                            yypushstate(CLASS2);
@@ -854,72 +848,80 @@ class _RegExLexer implements FlexLexer {
                         }
                         return RegExpTT.CHARACTER;
           }
-        case 111: break;
+        case 109: break;
         case 19: 
           { if (commentMode) { yypushstate(COMMENT); return RegExpTT.COMMENT; } else return RegExpTT.CHARACTER;
           }
-        case 112: break;
+        case 110: break;
         case 51: 
           { yypushstate(PROP); return RegExpTT.PROPERTY;
           }
-        case 113: break;
+        case 111: break;
         case 8: 
           { yypushstate(CLASS2);
                             return RegExpTT.CLASS_BEGIN;
           }
-        case 114: break;
+        case 112: break;
         case 71: 
           { return RegExpTT.POS_LOOKBEHIND;
           }
-        case 115: break;
-        case 43: 
-          { return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
-          }
-        case 116: break;
+        case 113: break;
         case 73: 
           { return RegExpTT.HEX_CHAR;
           }
-        case 117: break;
+        case 114: break;
         case 1: 
           { handleOptions(); return RegExpTT.OPTIONS_ON;
           }
-        case 118: break;
+        case 115: break;
+        case 43: 
+          { if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+          }
+        case 116: break;
         case 59: 
           { return allowNestedCharacterClasses ? RegExpTT.ANDAND : RegExpTT.CHARACTER;
           }
-        case 119: break;
+        case 117: break;
         case 2: 
           { yypopstate(); return RegExpTT.COMMENT;
           }
-        case 120: break;
+        case 118: break;
         case 17: 
           { return RegExpTT.MINUS;
           }
-        case 121: break;
+        case 119: break;
         case 47: 
           { return RegExpTT.ESC_CTRL_CHARACTER;
           }
-        case 122: break;
+        case 120: break;
         case 32: 
           { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE;
           }
-        case 123: break;
+        case 121: break;
         case 13: 
           { return RegExpTT.QUEST;
           }
-        case 124: break;
+        case 122: break;
+        case 5: 
+          { capturingGroupCount++; return RegExpTT.GROUP_BEGIN;
+          }
+        case 123: break;
         case 15: 
           { return RegExpTT.PLUS;
           }
-        case 125: break;
+        case 124: break;
         case 67: 
           { return RegExpTT.OCT_CHAR;
           }
-        case 126: break;
+        case 125: break;
         case 39: 
           { yybegin(YYINITIAL); return RegExpTT.QUOTE;
           }
-        case 127: break;
+        case 126: break;
         case 20: 
           { if (allowDanglingMetacharacters) {
                           yypopstate(); yypushback(1); 
@@ -927,15 +929,15 @@ class _RegExLexer implements FlexLexer {
                           return RegExpTT.BAD_CHARACTER;
                         }
           }
-        case 128: break;
+        case 127: break;
         case 31: 
           { yypopstate(); yypushback(1);
           }
-        case 129: break;
+        case 128: break;
         case 27: 
           { yybegin(CLASS1); return RegExpTT.CARET;
           }
-        case 130: break;
+        case 129: break;
         case 57: 
           // lookahead expression with fixed base length
           zzMarkedPos = zzStartRead + 1;
@@ -945,91 +947,100 @@ class _RegExLexer implements FlexLexer {
                             }
                             return RegExpTT.CHARACTER;
           }
-        case 131: break;
+        case 130: break;
         case 58: 
           { if (!allowNestedCharacterClasses) return RegExpTT.CHARACTER;
                                 return RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 132: break;
+        case 131: break;
         case 38: 
           { yybegin(YYINITIAL); return RegExpTT.GT;
           }
-        case 133: break;
+        case 132: break;
         case 69: 
           { yybegin(PY_NAMED_GROUP_REF); return RegExpTT.PYTHON_NAMED_GROUP_REF;
           }
-        case 134: break;
+        case 133: break;
         case 16: 
           { return RegExpTT.UNION;
           }
-        case 135: break;
+        case 134: break;
         case 3: 
           { return RegExpTT.CHARACTER;
           }
-        case 136: break;
+        case 135: break;
         case 64: 
           { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP;
           }
-        case 137: break;
+        case 136: break;
         case 40: 
           { yybegin(OPTIONS); return RegExpTT.SET_OPTIONS;
           }
-        case 138: break;
+        case 137: break;
         case 26: 
           { yybegin(CLASS2); return RegExpTT.CHARACTER;
           }
-        case 139: break;
+        case 138: break;
         case 68: 
           { if (xmlSchemaMode) { yypushback(1); return RegExpTT.CHAR_CLASS; } else return RegExpTT.CTRL;
           }
-        case 140: break;
+        case 139: break;
         case 30: 
           { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.ESC_CHARACTER;
           }
-        case 141: break;
+        case 140: break;
         case 12: 
           { return RegExpTT.DOLLAR;
           }
-        case 142: break;
+        case 141: break;
         case 50: 
           { if (xmlSchemaMode) return RegExpTT.CHAR_CLASS; else return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
           }
-        case 143: break;
+        case 142: break;
         case 42: 
           { return RegExpTT.REDUNDANT_ESCAPE;
           }
-        case 144: break;
+        case 143: break;
         case 55: 
           { return (allowHexDigitClass || allowHorizontalWhitespaceClass ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN);
           }
-        case 145: break;
+        case 144: break;
         case 48: 
           { return yystate() != CLASS2 ? RegExpTT.BOUNDARY : RegExpTT.ESC_CHARACTER;
           }
-        case 146: break;
+        case 145: break;
         case 22: 
           { yypopstate(); return RegExpTT.RBRACE;
           }
-        case 147: break;
+        case 146: break;
         case 54: 
           { return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN;
           }
-        case 148: break;
+        case 147: break;
         case 53: 
           { return RegExpTT.BAD_HEX_VALUE;
           }
-        case 149: break;
+        case 148: break;
         case 9: 
           { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
           }
-        case 150: break;
+        case 149: break;
         case 11: 
           { return RegExpTT.CARET;
           }
-        case 151: break;
+        case 150: break;
         case 45: 
           { return RegExpTT.ESC_CHARACTER;
           }
+        case 151: break;
+        case 74: 
+          { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
+                                if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+          }
         case 152: break;
         default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
index ec2b9192c2d5..c1cff8aff61e 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
@@ -79,7 +79,12 @@ public final class RegExpLanguageHosts extends ClassExtension<RegExpLanguageHost
       return true;
     }
     final RegExpLanguageHost host = findRegExpHost(regExpChar);
-    return host != null && host.supportsExtendedHexCharacter(regExpChar);
+    try {
+      return host != null && host.supportsExtendedHexCharacter(regExpChar);
+    } catch (AbstractMethodError e) {
+      // supportsExtendedHexCharacter not present
+      return false;
+    }
   }
 
   public boolean supportsNamedGroupSyntax(@Nullable final RegExpGroup group) {
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index a40cd5a6291d..d429bd24c6ac 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
@@ -2,10 +2,11 @@
 package org.intellij.lang.regexp;
 
 import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-import java.util.LinkedList;
-import java.util.EnumSet;
 import com.intellij.psi.StringEscapesTokenTypes;
+import com.intellij.psi.tree.IElementType;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
 
 @SuppressWarnings("ALL")
 %%
@@ -20,12 +21,13 @@ import com.intellij.psi.StringEscapesTokenTypes;
 
 %{
     // This adds support for nested states. I'm no JFlex pro, so maybe this is overkill, but it works quite well.
-    private final LinkedList<Integer> states = new LinkedList();
+    private final ArrayList<Integer> states = new ArrayList();
 
     // This was an idea to use the regex implementation for XML schema regexes (which use a slightly different syntax)
     // as well, but is currently unfinished as it requires to tweak more places than just the lexer.
     private boolean xmlSchemaMode;
 
+    private int capturingGroupCount = 0;
 
     private boolean allowDanglingMetacharacters;
     private boolean allowNestedCharacterClasses;
@@ -49,11 +51,12 @@ import com.intellij.psi.StringEscapesTokenTypes;
     }
 
     private void yypushstate(int state) {
-        states.addFirst(yystate());
+        states.add(yystate());
         yybegin(state);
     }
+
     private void yypopstate() {
-        final int state = states.removeFirst();
+        final int state = states.remove(states.size() - 1);
         yybegin(state);
     }
 
@@ -144,15 +147,21 @@ HEX_CHAR=[0-9a-fA-F]
     subexpressions exist at that point in the regular expression, otherwise the
     parser will drop digits until the number is smaller or equal to the existing
     number of groups or it is one digit."
-
-    So, for 100% compatibility, backrefs > 9 should be resolved by the parser, but
-    I'm not sure if it's worth the effort - at least not atm.
 */
 {ESCAPE} [0-7]{3}             { if (allowOctalNoLeadingZero) return RegExpTT.OCT_CHAR;
-                                return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER;
+                                if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
                               }
 
-{ESCAPE} {DIGITS}             { return yystate() != CLASS2 ? RegExpTT.BACKREF : RegExpTT.ESC_CHARACTER; }
+{ESCAPE} {DIGITS}             { if (yystate() == CLASS2) return RegExpTT.ESC_CHARACTER;
+                                while (yylength() > 2 && Integer.parseInt(yytext().toString().substring(1)) > capturingGroupCount) {
+                                  yypushback(1);
+                                }
+                                return RegExpTT.BACKREF;
+                              }
 
 {ESCAPE}  "-"                 { return RegExpTT.ESC_CHARACTER; }
 {ESCAPE}  {META}              { return RegExpTT.ESC_CHARACTER; }
@@ -256,7 +265,7 @@ HEX_CHAR=[0-9a-fA-F]
 
 
 <YYINITIAL> {
-  {LPAREN}      { return RegExpTT.GROUP_BEGIN; }
+  {LPAREN}      { capturingGroupCount++; return RegExpTT.GROUP_BEGIN; }
   {RPAREN}      { return RegExpTT.GROUP_END;   }
 
   "|"           { return RegExpTT.UNION;  }
diff --git a/RegExpSupport/testData/RETest.xml b/RegExpSupport/testData/RETest.xml
index 88ace1f83294..f42b9af45c51 100644
--- a/RegExpSupport/testData/RETest.xml
+++ b/RegExpSupport/testData/RETest.xml
@@ -730,6 +730,14 @@
       <pattern>([ab]+)=\1</pattern>
       <expected>OK</expected>
     </test>
+    <test>
+      <pattern>(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)\105</pattern>
+      <expected>OK</expected>
+    </test>
+    <test>
+      <pattern>(.)\11</pattern>
+      <expected>OK</expected>
+    </test>
     <test verify="false">
       <pattern>([ab]+)=\2</pattern>
       <expected>ERR</expected>
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 17f419dece1d..ebfcc890988a 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -262,7 +262,7 @@ libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3",
 libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
-libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20120920", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
+libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20131209", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html")
 libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0", attachedTo: "ByteCodeViewer", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "jsr305", libraryName: "jsr305", version: "snapshot", license: "BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://code.google.com/p/jsr-305/source/browse/trunk/ri/LICENSE")
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 2799ae550865..8e2376b71c55 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -691,6 +691,26 @@ private String submapToXml(Map properties, List keys) {
   return buff.toString()
 }
 
+private List<File> getChildren(File file) {
+  if (!file.isDirectory()) return []
+  return file.listFiles().sort { File f -> f.name.toLowerCase() }
+}
+
+binding.setVariable("getCustomJDK", { File customJdkDir ->
+  getChildren(customJdkDir).each {
+    if (it.getName().endsWith(".tar.gz")) {
+      def customJdkFileName = it.getAbsolutePath().substring(0, it.getAbsolutePath().length() - 3)
+      if (new File(customJdkFileName).exists()){ ant.delete(file: customJdkFileName) }
+      if (new File("${home}/build/jdk/custom_jdk_${buildNumber}.tar").exists()){
+        ant.delete(file: "${home}/build/jdk/custom_jdk_${buildNumber}.tar")
+      }
+      ant.gunzip(src: it.getAbsolutePath())
+      projectBuilder.info("customJdkFileName: " + customJdkFileName)
+      ant.copy(file: customJdkFileName, tofile: "${home}/build/jdk/custom_jdk_${buildNumber}.tar")
+    }
+  }
+})
+
 binding.setVariable("buildWinZip", { String zipPath, List paths ->
   projectBuilder.stage(".win.zip")
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index a35a03630ad9..a5685017d365 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -73,7 +73,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
-import org.jetbrains.jps.api.RequestFuture;
+import org.jetbrains.jps.api.TaskFuture;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 
 import javax.swing.*;
@@ -138,7 +138,7 @@ public class CompileDriver {
           return;
         }
         try {
-          final RequestFuture future = compileInExternalProcess(compileContext, true);
+          final TaskFuture future = compileInExternalProcess(compileContext, true);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
@@ -194,7 +194,7 @@ public class CompileDriver {
   }
 
   @Nullable
-  private RequestFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
+  private TaskFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
     throws Exception {
     final CompileScope scope = compileContext.getCompileScope();
     final Collection<String> paths = CompileScopeUtil.fetchFiles(compileContext);
@@ -400,7 +400,7 @@ public class CompileDriver {
             return;
           }
 
-          final RequestFuture future = compileInExternalProcess(compileContext, false);
+          final TaskFuture future = compileInExternalProcess(compileContext, false);
           if (future != null) {
             while (!future.waitFor(200L, TimeUnit.MILLISECONDS)) {
               if (indicator.isCanceled()) {
@@ -646,7 +646,6 @@ public class CompileDriver {
       final Module[] scopeModules = scope.getAffectedModules();
       final List<String> modulesWithoutOutputPathSpecified = new ArrayList<String>();
       final List<String> modulesWithoutJdkAssigned = new ArrayList<String>();
-      final CompilerConfiguration config = CompilerConfiguration.getInstance(myProject);
       final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
       for (final Module module : scopeModules) {
         if (!compilerManager.isValidationEnabled(module)) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index bc31490a54b6..efaf9e2b4346 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -58,10 +58,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.startup.StartupManager;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.ShutDownTracker;
-import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
@@ -112,8 +109,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.*;
 import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
@@ -152,8 +148,10 @@ public class BuildManager implements ApplicationComponent{
   private final File mySystemDirectory;
   private final ProjectManager myProjectManager;
 
-  private final Map<RequestFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<RequestFuture, Project>());
+  private final Map<TaskFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<TaskFuture, Project>());
   private final Map<String, RequestFuture> myBuildsInProgress = Collections.synchronizedMap(new HashMap<String, RequestFuture>());
+  private final Map<String, Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>> myPreloadedBuilds =
+    Collections.synchronizedMap(new HashMap<String, Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>>());
   private final BuildProcessClasspathManager myClasspathManager = new BuildProcessClasspathManager();
   private final SequentialTaskExecutor myRequestsProcessor = new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE);
   private final Map<String, ProjectData> myProjectDataMap = Collections.synchronizedMap(new HashMap<String, ProjectData>());
@@ -385,6 +383,8 @@ public class BuildManager implements ApplicationComponent{
   }
 
   public void clearState(Project project) {
+    cancelPreloadedBuilds(project);
+    
     final String projectPath = getProjectPath(project);
     synchronized (myProjectDataMap) {
       final ProjectData data = myProjectDataMap.get(projectPath);
@@ -447,7 +447,7 @@ public class BuildManager implements ApplicationComponent{
     }
     final List<TargetTypeBuildScope> scopes = CmdlineProtoUtil.createAllModulesScopes(false);
     final AutoMakeMessageHandler handler = new AutoMakeMessageHandler(project);
-    final RequestFuture future = scheduleBuild(
+    final TaskFuture future = scheduleBuild(
       project, false, true, false, scopes, Collections.<String>emptyList(), Collections.<String, String>emptyMap(), handler
     );
     if (future != null) {
@@ -526,12 +526,12 @@ public class BuildManager implements ApplicationComponent{
     return false;
   }
 
-  public Collection<RequestFuture> cancelAutoMakeTasks(Project project) {
-    final Collection<RequestFuture> futures = new SmartList<RequestFuture>();
+  public Collection<TaskFuture> cancelAutoMakeTasks(Project project) {
+    final Collection<TaskFuture> futures = new SmartList<TaskFuture>();
     synchronized (myAutomakeFutures) {
-      for (Map.Entry<RequestFuture, Project> entry : myAutomakeFutures.entrySet()) {
+      for (Map.Entry<TaskFuture, Project> entry : myAutomakeFutures.entrySet()) {
         if (entry.getValue().equals(project)) {
-          final RequestFuture future = entry.getKey();
+          final TaskFuture future = entry.getKey();
           future.cancel(false);
           futures.add(future);
         }
@@ -540,211 +540,261 @@ public class BuildManager implements ApplicationComponent{
     return futures;
   }
 
+  private void cancelPreloadedBuilds(Project project) {
+    final String projectPath = getProjectPath(project);
+    runCommand(new Runnable() {
+      @Override
+      public void run() {
+        Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> pair = takePreloadedProcess(projectPath);
+        if (pair != null) {
+          final RequestFuture<PreloadedProcessMessageHandler> future = pair.first;
+          myMessageDispatcher.cancelSession(future.getRequestID());
+          // waiting for preloaded process from project's task queue guarantees no build is started for this project
+          // until this one gracefully exits and closes all its storages
+          getProjectData(projectPath).taskQueue.submit(new Runnable() {
+            @Override
+            public void run() {
+              future.waitFor();
+            }
+          });
+        }
+      }
+    });
+  }
+
   @Nullable
-  public RequestFuture scheduleBuild(
+  private Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> takePreloadedProcess(String projectPath) {
+    Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> result;
+    final Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> preloadProgress = myPreloadedBuilds.remove(projectPath);
+    try {
+      result = preloadProgress != null ? preloadProgress.get() : null;
+    }
+    catch (Throwable e) {
+      LOG.info(e);
+      result = null;
+    }
+    return result;
+  }
+
+  @Nullable
+  public TaskFuture scheduleBuild(
     final Project project, final boolean isRebuild, final boolean isMake,
     final boolean onlyCheckUpToDate, final List<TargetTypeBuildScope> scopes,
     final Collection<String> paths,
     final Map<String, String> userData, final DefaultMessageHandler messageHandler) {
 
     final String projectPath = getProjectPath(project);
-    final UUID sessionId = UUID.randomUUID();
-    final boolean isAutomake = messageHandler instanceof AutoMakeMessageHandler;
-    final BuilderMessageHandler handler = new MessageHandlerWrapper(messageHandler) {
-      @Override
-      public void buildStarted(UUID sessionId) {
-        super.buildStarted(sessionId);
-        try {
-          ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildStarted(project, sessionId, isAutomake);
-        }
-        catch (Throwable e) {
-          LOG.error(e);
-        }
-      }
-
-      @Override
-      public void sessionTerminated(UUID sessionId) {
-        try {
-          super.sessionTerminated(sessionId);
-        }
-        finally {
-          try {
-            ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildFinished(project, sessionId, isAutomake);
-          }
-          catch (Throwable e) {
-            LOG.error(e);
-          }
-        }
-      }
-    };
-    // ensure server is listening
-    if (myListenPort < 0) {
-      try {
-        synchronized (this) {
-          if (myListenPort < 0) {
-            myListenPort = startListening();
-          }
-        }
-      }
-      catch (Exception e) {
-        handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), null));
-        handler.sessionTerminated(sessionId);
-        return null;
-      }
+    final BuilderMessageHandler handler = new NotifyingMessageHandler(project, messageHandler, messageHandler instanceof AutoMakeMessageHandler);
+    try {
+      ensureListening();
+    }
+    catch (Exception e) {
+      final UUID sessionId = UUID.randomUUID(); // the actual session did not start, use random UUID
+      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), null));
+      handler.sessionTerminated(sessionId);
+      return null;
     }
 
-    try {
-      final RequestFuture<BuilderMessageHandler> future = new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
-        @Override
-        public void cancel(RequestFuture<BuilderMessageHandler> future) throws Exception {
-          myMessageDispatcher.cancelSession(future.getRequestID());
+    final DelegateFuture<BuilderMessageHandler> _future = new DelegateFuture<BuilderMessageHandler>();
+    // by using the same queue that processes events we ensure that
+    // the build will be aware of all events that have happened before this request
+    runCommand(new Runnable() {
+      @Override
+      public void run() {
+
+        final Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> preloaded = takePreloadedProcess(projectPath);
+        final RequestFuture<PreloadedProcessMessageHandler> preloadedFuture = preloaded != null? preloaded.first : null;
+        final boolean usingPreloadedProcess = preloadedFuture != null;
+
+        final UUID sessionId;
+        if (usingPreloadedProcess) {
+          LOG.info("Using preloaded build process to compile " + projectPath);
+          sessionId = preloadedFuture.getRequestID();
+          preloadedFuture.getMessageHandler().setDelegateHandler(handler);
+        }
+        else {
+          sessionId = UUID.randomUUID();
         }
-      });
-      // by using the same queue that processes events we ensure that
-      // the build will be aware of all events that have happened before this request
-      runCommand(new Runnable() {
-        @Override
-        public void run() {
-          if (future.isCancelled() || project.isDisposed()) {
-            handler.sessionTerminated(sessionId);
-            future.setDone();
-            return;
-          }
 
-          final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
-            CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder()
-              .setGlobalOptionsPath(PathManager.getOptionsPath())
-              .build();
-          CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
-          final SequentialTaskExecutor projectTaskQueue;
-          synchronized (myProjectDataMap) {
-            ProjectData data = myProjectDataMap.get(projectPath);
-            if (data == null) {
-              data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE));
-              myProjectDataMap.put(projectPath, data);
-            }
-            if (isRebuild) {
-              data.dropChanges();
-            }
-            if (IS_UNIT_TEST_MODE) {
-              LOG.info("Scheduling build for " +
-                       projectPath +
-                       "; CHANGED: " +
-                       new HashSet<String>(convertToStringPaths(data.myChanged)) +
-                       "; DELETED: " +
-                       new HashSet<String>(convertToStringPaths(data.myDeleted)));
-            }
-            currentFSChanges = data.getAndResetRescanFlag() ? null : data.createNextEvent();
-            projectTaskQueue = data.taskQueue;
+        final RequestFuture<? extends BuilderMessageHandler> future = usingPreloadedProcess? preloadedFuture : new RequestFuture<BuilderMessageHandler>(handler, sessionId, new RequestFuture.CancelAction<BuilderMessageHandler>() {
+          @Override
+          public void cancel(RequestFuture<BuilderMessageHandler> future) throws Exception {
+            myMessageDispatcher.cancelSession(future.getRequestID());
           }
+        });
+        _future.setDelegate(future);
 
-          final CmdlineRemoteProto.Message.ControllerMessage params;
+        if (!usingPreloadedProcess && (future.isCancelled() || project.isDisposed())) {
+          // in case of preloaded process the process was already running, so the handler will be notified upon process termination
+          handler.sessionTerminated(sessionId);
+          ((BasicFuture)future).setDone();
+          return;
+        }
+
+        final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
+          CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(PathManager.getOptionsPath()).build();
+        CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
+        final SequentialTaskExecutor projectTaskQueue;
+        synchronized (myProjectDataMap) {
+          final ProjectData data = getProjectData(projectPath);
           if (isRebuild) {
-            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, Collections.<String>emptyList(), userData, globals, null);
+            data.dropChanges();
           }
-          else if (onlyCheckUpToDate) {
-            params = CmdlineProtoUtil.createUpToDateCheckRequest(projectPath, scopes, paths, userData, globals, currentFSChanges);
-          }
-          else {
-            params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths,
-                                                         userData, globals, currentFSChanges);
+          if (IS_UNIT_TEST_MODE) {
+            LOG.info("Scheduling build for " +
+                     projectPath +
+                     "; CHANGED: " +
+                     new HashSet<String>(convertToStringPaths(data.myChanged)) +
+                     "; DELETED: " +
+                     new HashSet<String>(convertToStringPaths(data.myDeleted)));
           }
+          currentFSChanges = data.getAndResetRescanFlag() ? null : data.createNextEvent();
+          projectTaskQueue = data.taskQueue;
+        }
 
-          myMessageDispatcher.registerBuildMessageHandler(sessionId, new MessageHandlerWrapper(handler) {
+        final CmdlineRemoteProto.Message.ControllerMessage params;
+        if (isRebuild) {
+          params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, Collections.<String>emptyList(), userData, globals, null);
+        }
+        else if (onlyCheckUpToDate) {
+          params = CmdlineProtoUtil.createUpToDateCheckRequest(projectPath, scopes, paths, userData, globals, currentFSChanges);
+        }
+        else {
+          params = CmdlineProtoUtil.createBuildRequest(projectPath, scopes, isMake ? Collections.<String>emptyList() : paths, userData, globals, currentFSChanges);
+        }
+        if (!usingPreloadedProcess) {
+          myMessageDispatcher.registerBuildMessageHandler(future, params);
+        }
+
+        try {
+          projectTaskQueue.submit(new Runnable() {
             @Override
-            public void sessionTerminated(UUID sessionId) {
+            public void run() {
+              Throwable execFailure = null;
               try {
-                super.sessionTerminated(sessionId);
-              }
-              finally {
-                future.setDone();
-              }
-            }
-          }, params);
-
-          try {
-            projectTaskQueue.submit(new Runnable() {
-              @Override
-              public void run() {
-                Throwable execFailure = null;
-                try {
-                  if (project.isDisposed()) {
+                if (project.isDisposed()) {
+                  if (usingPreloadedProcess) {
+                    future.cancel(true);
+                  }
+                  else {
                     return;
                   }
-                  myBuildsInProgress.put(projectPath, future);
-                  final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, sessionId);
-                  final StringBuilder stdErrOutput = new StringBuilder();
+                }
+                myBuildsInProgress.put(projectPath, future);
+                final OSProcessHandler processHandler;
+                final StringBuilder errorsOnLaunch = new StringBuilder();
+                if (usingPreloadedProcess) {
+                  final boolean paramsSent = myMessageDispatcher.sendBuildParameters(future.getRequestID(), params);
+                  if (!paramsSent) {
+                    myMessageDispatcher.cancelSession(future.getRequestID());
+                  }
+                  processHandler = preloaded.second;
+                }
+                else {
+                  processHandler = launchBuildProcess(project, myListenPort, sessionId, false);
                   processHandler.addProcessListener(new ProcessAdapter() {
                     @Override
                     public void onTextAvailable(ProcessEvent event, Key outputType) {
-                      // re-translate builder's output to idea.log
-                      final String text = event.getText();
-                      if (!StringUtil.isEmptyOrSpaces(text)) {
-                        LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim());
-                        if (stdErrOutput.length() < 1024 && ProcessOutputTypes.STDERR.equals(outputType)) {
-                          stdErrOutput.append(text);
+                      if (ProcessOutputTypes.STDERR.equals(outputType)) {
+                        if (errorsOnLaunch.length() < 1024) {
+                          final String text = event.getText();
+                          if (!StringUtil.isEmptyOrSpaces(text)) {
+                            errorsOnLaunch.append(text);
+                          }
                         }
                       }
                     }
                   });
                   processHandler.startNotify();
-                  final boolean terminated = processHandler.waitFor();
-                  if (terminated) {
-                    final int exitValue = processHandler.getProcess().exitValue();
-                    if (exitValue != 0) {
-                      final StringBuilder msg = new StringBuilder();
-                      msg.append("Abnormal build process termination: ");
-                      if (stdErrOutput.length() > 0) {
-                        msg.append("\n").append(stdErrOutput);
-                      }
-                      else {
-                        msg.append("unknown error");
-                      }
-                      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(msg.toString(), null));
+                }
+
+                final boolean terminated = processHandler.waitFor();
+                if (terminated) {
+                  final int exitValue = processHandler.getProcess().exitValue();
+                  if (exitValue != 0) {
+                    final StringBuilder msg = new StringBuilder();
+                    msg.append("Abnormal build process termination: ");
+                    if (errorsOnLaunch.length() > 0) {
+                      msg.append("\n").append(errorsOnLaunch);
                     }
-                  }
-                  else {
-                    handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure("Disconnected from build process", null));
+                    else {
+                      msg.append("unknown error");
+                    }
+                    handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(msg.toString(), null));
                   }
                 }
-                catch (Throwable e) {
-                  execFailure = e;
-                }
-                finally {
-                  myBuildsInProgress.remove(projectPath);
-                  if (myMessageDispatcher.getAssociatedChannel(sessionId) == null) {
-                    // either the connection has never been established (process not started or execution failed), or no messages were sent from the launched process.
-                    // in this case the session cannot be unregistered by the message dispatcher
-                    final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
-                    if (unregistered != null) {
-                      if (execFailure != null) {
-                        unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(execFailure.getMessage(), execFailure));
-                      }
-                      unregistered.sessionTerminated(sessionId);
-                    }
-                  }
+                else {
+                  handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure("Disconnected from build process", null));
                 }
               }
-            });
-          }
-          catch (Throwable e) {
-            final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
-            if (unregistered != null) {
-              unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
-              unregistered.sessionTerminated(sessionId);
+              catch (Throwable e) {
+                execFailure = e;
+              }
+              finally {
+                myBuildsInProgress.remove(projectPath);
+                if (myMessageDispatcher.getAssociatedChannel(sessionId) == null) {
+                  // either the connection has never been established (process not started or execution failed), or no messages were sent from the launched process.
+                  // in this case the session cannot be unregistered by the message dispatcher
+                  final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
+                  if (unregistered != null) {
+                    if (execFailure != null) {
+                      unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(execFailure.getMessage(), execFailure));
+                    }
+                    unregistered.sessionTerminated(sessionId);
+                  }
+                }
+
+                if (Registry.is("compiler.process.preload") && !project.isDisposed()) {
+                  runCommand(new Runnable() {
+                    public void run() {
+                      try {
+                        final Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> preloadResult = launchPreloadedBuildProcess(project, projectTaskQueue);
+                        myPreloadedBuilds.put(projectPath, preloadResult);
+                      }
+                      catch (Exception e) {
+                        LOG.info("Error pre-loading build process for project " + projectPath, e);
+                      }
+                    }
+                  });
+                }
+
+              }
             }
+          });
+        }
+        catch (Throwable e) {
+          final BuilderMessageHandler unregistered = myMessageDispatcher.unregisterBuildMessageHandler(sessionId);
+          if (unregistered != null) {
+            unregistered.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
+            unregistered.sessionTerminated(sessionId);
           }
         }
-      });
+      }
+    });
 
-      return future;
-    }
-    catch (Throwable e) {
-      handler.handleFailure(sessionId, CmdlineProtoUtil.createFailure(e.getMessage(), e));
-      handler.sessionTerminated(sessionId);
-    }
+    return _future;
+  }
 
-    return null;
+  @NotNull
+  private ProjectData getProjectData(String projectPath) {
+    synchronized (myProjectDataMap) {
+      ProjectData data = myProjectDataMap.get(projectPath);
+      if (data == null) {
+        data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE));
+        myProjectDataMap.put(projectPath, data);
+      }
+      return data;
+    }
+  }
+
+  private void ensureListening() throws Exception {
+    if (myListenPort < 0) {
+      synchronized (this) {
+        if (myListenPort < 0) {
+          myListenPort = startListening();
+        }
+      }
+    }
   }
 
   @Override
@@ -762,7 +812,45 @@ public class BuildManager implements ApplicationComponent{
     return "com.intellij.compiler.server.BuildManager";
   }
 
-  private OSProcessHandler launchBuildProcess(Project project, final int port, final UUID sessionId) throws ExecutionException {
+  private Future<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>> launchPreloadedBuildProcess(final Project project, SequentialTaskExecutor projectTaskQueue) throws Exception {
+    ensureListening();
+    
+    // launching build process from projectTaskQueue ensures that no other build process for this project is currently running
+    return projectTaskQueue.submit(new Callable<Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler>>() {
+      public Pair<RequestFuture<PreloadedProcessMessageHandler>, OSProcessHandler> call() throws Exception {
+        final RequestFuture<PreloadedProcessMessageHandler> future = new RequestFuture<PreloadedProcessMessageHandler>(new PreloadedProcessMessageHandler(project), UUID.randomUUID(), new RequestFuture.CancelAction<PreloadedProcessMessageHandler>() {
+          @Override
+          public void cancel(RequestFuture<PreloadedProcessMessageHandler> future) throws Exception {
+            myMessageDispatcher.cancelSession(future.getRequestID());
+          }
+        });
+        try {
+          myMessageDispatcher.registerBuildMessageHandler(future, null);
+          final OSProcessHandler processHandler = launchBuildProcess(project, myListenPort, future.getRequestID(), true);
+          processHandler.addProcessListener(new ProcessAdapter() {
+            @Override
+            public void onTextAvailable(ProcessEvent event, Key outputType) {
+              if (ProcessOutputTypes.STDERR.equals(outputType)) {
+                final String text = event.getText();
+                if (!StringUtil.isEmptyOrSpaces(text)) {
+                  LOG.info("PRELOADED_BUILD_PROCESS: " + text);
+                }
+              }
+            }
+          });
+
+          processHandler.startNotify();
+          return Pair.create(future, processHandler);
+        }
+        catch (ExecutionException e) {
+          myMessageDispatcher.unregisterBuildMessageHandler(future.getRequestID());
+          throw e;
+        }
+      }
+    });
+  }
+  
+  private OSProcessHandler launchBuildProcess(Project project, final int port, final UUID sessionId, boolean requestProjectPreload) throws ExecutionException {
     final String compilerPath;
     final String vmExecutablePath;
     JavaSdkVersion sdkVersion = null;
@@ -863,6 +951,11 @@ public class BuildManager implements ApplicationComponent{
     }
     cmdLine.addParameter("-Djdt.compiler.useSingleThread=true"); // always run eclipse compiler in single-threaded mode
 
+    if (requestProjectPreload) {
+      cmdLine.addParameter("-Dpreload.project.path=" + FileUtil.toCanonicalPath(getProjectPath(project)));
+      cmdLine.addParameter("-Dpreload.config.path=" + FileUtil.toCanonicalPath(PathManager.getOptionsPath()));
+    }
+    
     final String shouldGenerateIndex = System.getProperty(GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION);
     if (shouldGenerateIndex != null) {
       cmdLine.addParameter("-D"+ GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION +"=" + shouldGenerateIndex);
@@ -961,12 +1054,24 @@ public class BuildManager implements ApplicationComponent{
 
     final Process process = cmdLine.createProcess();
 
-    return new OSProcessHandler(process, null, mySystemCharset) {
+    final OSProcessHandler processHandler = new OSProcessHandler(process, null, mySystemCharset) {
       @Override
       protected boolean shouldDestroyProcessRecursively() {
         return true;
       }
     };
+    processHandler.addProcessListener(new ProcessAdapter() {
+      @Override
+      public void onTextAvailable(ProcessEvent event, Key outputType) {
+        // re-translate builder's output to idea.log
+        final String text = event.getText();
+        if (!StringUtil.isEmptyOrSpaces(text)) {
+          LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim());
+        }
+      }
+    });
+    
+    return processHandler;
   }
 
   public File getBuildSystemDirectory() {
@@ -1086,6 +1191,50 @@ public class BuildManager implements ApplicationComponent{
     }
   }
 
+  private static class NotifyingMessageHandler extends DelegatingMessageHandler {
+    private final Project myProject;
+    private final BuilderMessageHandler myDelegateHandler;
+    private boolean myIsAutomake;
+
+    public NotifyingMessageHandler(@NotNull Project project, @NotNull BuilderMessageHandler delegateHandler, final boolean isAutomake) {
+      myProject = project;
+      myDelegateHandler = delegateHandler;
+      myIsAutomake = isAutomake;
+    }
+
+    @Override
+    protected BuilderMessageHandler getDelegateHandler() {
+      return myDelegateHandler;
+    }
+
+    @Override
+    public void buildStarted(UUID sessionId) {
+      super.buildStarted(sessionId);
+      try {
+        ApplicationManager
+          .getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildStarted(myProject, sessionId, myIsAutomake);
+      }
+      catch (Throwable e) {
+        LOG.error(e);
+      }
+    }
+
+    @Override
+    public void sessionTerminated(UUID sessionId) {
+      try {
+        super.sessionTerminated(sessionId);
+      }
+      finally {
+        try {
+          ApplicationManager.getApplication().getMessageBus().syncPublisher(BuildManagerListener.TOPIC).buildFinished(myProject, sessionId, myIsAutomake);
+        }
+        catch (Throwable e) {
+          LOG.error(e);
+        }
+      }
+    }
+  }
+
   private class ProjectWatcher extends ProjectManagerAdapter {
     private final Map<Project, MessageBusConnection> myConnections = new HashMap<Project, MessageBusConnection>();
 
@@ -1169,7 +1318,8 @@ public class BuildManager implements ApplicationComponent{
 
     @Override
     public void projectClosing(Project project) {
-      for (RequestFuture future : cancelAutoMakeTasks(project)) {
+      cancelPreloadedBuilds(project);
+      for (TaskFuture future : cancelAutoMakeTasks(project)) {
         future.waitFor(500, TimeUnit.MILLISECONDS);
       }
     }
@@ -1185,13 +1335,14 @@ public class BuildManager implements ApplicationComponent{
   }
 
   private static class ProjectData {
+    @NotNull
     final SequentialTaskExecutor taskQueue;
     private final Set<InternedPath> myChanged = new THashSet<InternedPath>();
     private final Set<InternedPath> myDeleted = new THashSet<InternedPath>();
     private long myNextEventOrdinal = 0L;
     private boolean myNeedRescan = true;
 
-    private ProjectData(SequentialTaskExecutor taskQueue) {
+    private ProjectData(@NotNull SequentialTaskExecutor taskQueue) {
       this.taskQueue = taskQueue;
     }
 
@@ -1328,5 +1479,88 @@ public class BuildManager implements ApplicationComponent{
       return "/";
     }
   }
-  
+
+  private static final class DelegateFuture<T> implements TaskFuture<T> {
+    @Nullable
+    private TaskFuture<? extends T> myDelegate;
+    private Boolean myRequestedCancelState = null;
+
+    @NotNull
+    public synchronized TaskFuture<? extends T> getDelegate() {
+      TaskFuture<? extends T> delegate = myDelegate;
+      while (delegate == null) {
+        try {
+          wait();
+        }
+        catch (InterruptedException ignored) {
+        }
+        delegate = myDelegate;
+      }
+      return delegate;
+    }
+
+    public synchronized boolean setDelegate(@NotNull TaskFuture<? extends T> delegate) {
+      if (myDelegate == null) {
+        try {
+          myDelegate = delegate;
+          if (myRequestedCancelState != null) {
+            myDelegate.cancel(myRequestedCancelState);
+          }
+        }
+        finally {
+          notifyAll();
+        }
+        return true;
+      }
+      return false;
+    }
+
+    public synchronized boolean cancel(boolean mayInterruptIfRunning) {
+      final TaskFuture<? extends T> delegate = myDelegate;
+      if (delegate == null) {
+        myRequestedCancelState = mayInterruptIfRunning;
+        return true;
+      }
+      return delegate.cancel(mayInterruptIfRunning);
+    }
+
+    public void waitFor() {
+      getDelegate().waitFor();
+    }
+
+    public boolean waitFor(long timeout, TimeUnit unit) {
+      return getDelegate().waitFor(timeout, unit);
+    }
+
+    public boolean isCancelled() {
+      final TaskFuture<? extends T> delegate;
+      synchronized (this) {
+        delegate = myDelegate;
+        if (delegate == null) {
+          return myRequestedCancelState != null;
+        }
+      }
+      return delegate.isCancelled();
+    }
+
+    public boolean isDone() {
+      final TaskFuture<? extends T> delegate;
+      synchronized (this) {
+        delegate = myDelegate;
+        if (delegate == null) {
+          return false;
+        }
+      }
+      return delegate.isDone();
+    }
+
+    public T get() throws InterruptedException, java.util.concurrent.ExecutionException {
+      return getDelegate().get();
+    }
+
+    public T get(long timeout, TimeUnit unit) throws InterruptedException, java.util.concurrent.ExecutionException, TimeoutException {
+      return getDelegate().get(timeout, unit);
+    }
+  }
+
 }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index d324a620155b..59c19f0ad7fe 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -21,10 +21,12 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.AttributeKey;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.io.SimpleChannelInboundHandlerAdapter;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
+import org.jetbrains.jps.api.RequestFuture;
 
 import java.util.Map;
 import java.util.Set;
@@ -41,19 +43,34 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
 
   private static final AttributeKey<SessionData> SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData");
 
-  private final Map<UUID, SessionData> myMessageHandlers = new ConcurrentHashMap<UUID, SessionData>(16, 0.75f, 1);
+  private final Map<UUID, SessionData> mySessionDescriptors = new ConcurrentHashMap<UUID, SessionData>(16, 0.75f, 1);
   private final Set<UUID> myCanceledSessions = new ConcurrentHashSet<UUID>();
 
-  public void registerBuildMessageHandler(UUID sessionId,
-                                          BuilderMessageHandler handler,
-                                          CmdlineRemoteProto.Message.ControllerMessage params) {
-    myMessageHandlers.put(sessionId, new SessionData(sessionId, handler, params));
+  public void registerBuildMessageHandler(@NotNull final RequestFuture<? extends BuilderMessageHandler> future, @Nullable CmdlineRemoteProto.Message.ControllerMessage params) {
+    final BuilderMessageHandler wrappedHandler = new DelegatingMessageHandler() {
+      @Override
+      protected BuilderMessageHandler getDelegateHandler() {
+        return future.getMessageHandler();
+      }
+      
+      @Override
+      public void sessionTerminated(UUID sessionId) {
+        try {
+          super.sessionTerminated(sessionId);
+        }
+        finally {
+          future.setDone();
+        }
+      }
+    };
+    final UUID sessionId = future.getRequestID();
+    mySessionDescriptors.put(sessionId, new SessionData(sessionId, wrappedHandler, params));
   }
 
   @Nullable
   public BuilderMessageHandler unregisterBuildMessageHandler(UUID sessionId) {
     myCanceledSessions.remove(sessionId);
-    final SessionData data = myMessageHandlers.remove(sessionId);
+    final SessionData data = mySessionDescriptors.remove(sessionId);
     return data != null? data.handler : null;
   }
 
@@ -74,11 +91,36 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
 
   @Nullable
   public Channel getAssociatedChannel(final UUID sessionId) {
-    final SessionData data = myMessageHandlers.get(sessionId);
+    final SessionData data = mySessionDescriptors.get(sessionId);
     return data != null? data.channel : null;
   }
 
-
+  public boolean sendBuildParameters(@NotNull final UUID preloadedSessionId, @NotNull CmdlineRemoteProto.Message.ControllerMessage params) {
+    boolean succeeded = false;
+    final SessionData sessionData = mySessionDescriptors.get(preloadedSessionId);
+    if (sessionData != null) {
+      //noinspection SynchronizationOnLocalVariableOrMethodParameter
+      synchronized (sessionData) {
+        if (sessionData.state == SessionData.State.WAITING_PARAMS) {
+          sessionData.state = SessionData.State.RUNNING;
+          final Channel channel = sessionData.channel;
+          if (channel != null && channel.isActive()) {
+            sessionData.handler.buildStarted(preloadedSessionId);
+            channel.writeAndFlush(CmdlineProtoUtil.toMessage(preloadedSessionId, params));
+            succeeded = true;
+          }
+        }
+        else {
+          if (sessionData.state == SessionData.State.INITIAL) {
+            sessionData.params = params;
+            succeeded = true;
+          }
+        }
+      }
+    }
+    return succeeded;
+  }
+  
   @Override
   protected void messageReceived(ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception {
     SessionData sessionData = context.attr(SESSION_DATA).get();
@@ -89,7 +131,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
       final CmdlineRemoteProto.Message.UUID id = message.getSessionId();
       sessionId = new UUID(id.getMostSigBits(), id.getLeastSigBits());
 
-      sessionData = myMessageHandlers.get(sessionId);
+      sessionData = mySessionDescriptors.get(sessionId);
       if (sessionData != null) {
         sessionData.channel = context.channel();
         context.attr(SESSION_DATA).set(sessionData);
@@ -119,14 +161,25 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
         final CmdlineRemoteProto.Message.BuilderMessage builderMessage = message.getBuilderMessage();
         final CmdlineRemoteProto.Message.BuilderMessage.Type msgType = builderMessage.getType();
         if (msgType == CmdlineRemoteProto.Message.BuilderMessage.Type.PARAM_REQUEST) {
-          final CmdlineRemoteProto.Message.ControllerMessage params = sessionData.params;
-          if (params != null) {
-            handler.buildStarted(sessionId);
-            sessionData.params = null;
-            context.writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, params));
-          }
-          else {
-            cancelSession(sessionId);
+          //noinspection SynchronizationOnLocalVariableOrMethodParameter
+          synchronized (sessionData) {
+            final CmdlineRemoteProto.Message.ControllerMessage params = sessionData.params;
+            if (params != null) {
+              sessionData.state = SessionData.State.RUNNING;
+              handler.buildStarted(sessionId);
+              sessionData.params = null;
+              context.writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, params));
+            }
+            else {
+              if (sessionData.state == SessionData.State.INITIAL) {
+                sessionData.state = SessionData.State.WAITING_PARAMS;
+              }
+              else {
+                // this message is expected to be sent only once.
+                // To be on the safe side, cancel the session
+                cancelSession(sessionId);
+              }
+            }
           }
         }
         else {
@@ -165,12 +218,19 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
   }
 
   private static final class SessionData {
+    enum State {
+      INITIAL, WAITING_PARAMS, RUNNING
+    }
+    
+    @NotNull
     final UUID sessionId;
+    @NotNull
     final BuilderMessageHandler handler;
     volatile CmdlineRemoteProto.Message.ControllerMessage params;
     volatile Channel channel;
+    State state = State.INITIAL;
 
-    private SessionData(UUID sessionId, BuilderMessageHandler handler, CmdlineRemoteProto.Message.ControllerMessage params) {
+    private SessionData(@NotNull UUID sessionId, @NotNull BuilderMessageHandler handler, CmdlineRemoteProto.Message.ControllerMessage params) {
       this.sessionId = sessionId;
       this.handler = handler;
       this.params = params;
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
index 4681f859639d..2c8581110213 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuilderMessageHandler.java
@@ -25,6 +25,24 @@ import java.util.UUID;
  *         Date: 4/25/12
  */
 public interface BuilderMessageHandler {
+  BuilderMessageHandler DEAF = new BuilderMessageHandler() {
+    @Override
+    public void buildStarted(UUID sessionId) {
+    }
+
+    @Override
+    public void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg) {
+    }
+
+    @Override
+    public void handleFailure(UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
+    }
+
+    @Override
+    public void sessionTerminated(UUID sessionId) {
+    }
+  };
+  
   void buildStarted(UUID sessionId);
   
   void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg);
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
similarity index 59%
rename from java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java
rename to java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
index 68b5d5c9d5c4..653f3c7f0963 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/MessageHandlerWrapper.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/DelegatingMessageHandler.java
@@ -9,30 +9,27 @@ import java.util.UUID;
 * @author Eugene Zhuravlev
 *         Date: 7/3/13
 */
-class MessageHandlerWrapper implements BuilderMessageHandler {
-  private final BuilderMessageHandler myHandler;
+abstract class DelegatingMessageHandler implements BuilderMessageHandler {
 
-  public MessageHandlerWrapper(BuilderMessageHandler handler) {
-    myHandler = handler;
-  }
+  protected abstract BuilderMessageHandler getDelegateHandler();
 
   @Override
   public void buildStarted(UUID sessionId) {
-    myHandler.buildStarted(sessionId);
+    getDelegateHandler().buildStarted(sessionId);
   }
 
   @Override
   public void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg) {
-    myHandler.handleBuildMessage(channel, sessionId, msg);
+    getDelegateHandler().handleBuildMessage(channel, sessionId, msg);
   }
 
   @Override
   public void handleFailure(UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
-    myHandler.handleFailure(sessionId, failure);
+    getDelegateHandler().handleFailure(sessionId, failure);
   }
 
   @Override
   public void sessionTerminated(UUID sessionId) {
-    myHandler.sessionTerminated(sessionId);
+    getDelegateHandler().sessionTerminated(sessionId);
   }
 }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java
new file mode 100644
index 000000000000..5a8c3e28a1c6
--- /dev/null
+++ b/java/compiler/impl/src/com/intellij/compiler/server/PreloadedProcessMessageHandler.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.compiler.server;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+
+/**
+* @author Eugene Zhuravlev
+*         Date: 20-Oct-14
+*/
+class PreloadedProcessMessageHandler extends DelegatingMessageHandler {
+  @NotNull 
+  private final Project myProject;
+  private volatile BuilderMessageHandler myDelegateHandler;
+
+  public PreloadedProcessMessageHandler(@NotNull Project project) {
+    myProject = project;
+  }
+
+  @NotNull
+  public Project getProject() {
+    return myProject;
+  }
+
+  @Override
+  protected BuilderMessageHandler getDelegateHandler() {
+    final BuilderMessageHandler delegate = myDelegateHandler;
+    return delegate != null? delegate : BuilderMessageHandler.DEAF;
+  }
+
+  public void setDelegateHandler(BuilderMessageHandler delegateHandler) {
+    myDelegateHandler = delegateHandler;
+  }
+}
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
index e892a425ca75..34959665d0cf 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
@@ -50,7 +50,7 @@ public class JavaReferringObjectsValue extends JavaValue {
   }
 
   public JavaReferringObjectsValue(@NotNull JavaValue javaValue, boolean isField) {
-    super(null, javaValue.getDescriptor(), javaValue.getEvaluationContext(), null, false);
+    super(null, javaValue.getDescriptor(), javaValue.getEvaluationContext(), javaValue.getNodeManager(), false);
     myIsField = isField;
   }
 
@@ -84,7 +84,7 @@ public class JavaReferringObjectsValue extends JavaValue {
                   return reference;
                 }
               };
-              children.add(new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), null, true));
+              children.add(new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), getNodeManager(), true));
               i++;
             }
             else {
@@ -109,7 +109,7 @@ public class JavaReferringObjectsValue extends JavaValue {
                   return null;
                 }
               };
-              children.add("Referrer " + i++, new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), null, false));
+              children.add("Referrer " + i++, new JavaReferringObjectsValue(null, descriptor, getEvaluationContext(), getNodeManager(), false));
             }
           }
 
@@ -168,4 +168,10 @@ public class JavaReferringObjectsValue extends JavaValue {
     }
     return null;
   }
+
+  @Nullable
+  @Override
+  public XValueModifier getModifier() {
+    return null;
+  }
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
index 3df508e331a9..9cba64ac544a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
@@ -70,6 +70,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   private final EvaluationContextImpl myEvaluationContext;
   private final NodeManagerImpl myNodeManager;
   private final boolean myContextSet;
+  private final DebuggerManagerThreadImpl myDebuggerManagerThread;
 
   protected JavaValue(JavaValue parent,
                     @NotNull ValueDescriptorImpl valueDescriptor,
@@ -82,6 +83,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
     myEvaluationContext = evaluationContext;
     myNodeManager = nodeManager;
     myContextSet = contextSet;
+    myDebuggerManagerThread = evaluationContext.getDebugProcess().getManagerThread();
   }
 
   static JavaValue create(JavaValue parent,
@@ -113,6 +115,10 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
     return myEvaluationContext;
   }
 
+  public NodeManagerImpl getNodeManager() {
+    return myNodeManager;
+  }
+
   @Override
   public void computePresentation(@NotNull final XValueNode node, @NotNull XValuePlace place) {
     final SuspendContextImpl suspendContext = myEvaluationContext.getSuspendContext();
@@ -349,7 +355,11 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   }
 
   boolean scheduleCommand(SuspendContextCommandImpl command) {
-    return scheduleCommand(myEvaluationContext, null, command);
+    if (myEvaluationContext.getSuspendContext().isResumed()) {
+      return false;
+    }
+    myDebuggerManagerThread.schedule(command);
+    return true;
   }
 
   protected static boolean scheduleCommand(EvaluationContextImpl evaluationContext,
@@ -486,6 +496,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   @Nullable
   @Override
   public XReferrersProvider getReferrersProvider() {
+    if (myEvaluationContext.getSuspendContext().isResumed()) return null;
     return new XReferrersProvider() {
       @Override
       public XValue getReferringObjectsValue() {
@@ -497,16 +508,15 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
   @Nullable
   @Override
   public XInstanceEvaluator getInstanceEvaluator() {
-    final DebugProcessImpl process = myEvaluationContext.getDebugProcess();
     return new XInstanceEvaluator() {
       @Override
       public void evaluate(@NotNull final XDebuggerEvaluator.XEvaluationCallback callback, @NotNull final XStackFrame frame) {
-        process.getManagerThread().schedule(new DebuggerCommandImpl() {
+        myDebuggerManagerThread.schedule(new DebuggerCommandImpl() {
           @Override
           protected void action() throws Exception {
             ValueDescriptorImpl inspectDescriptor = myValueDescriptor;
             if (myValueDescriptor instanceof WatchItemDescriptor) {
-              inspectDescriptor = (ValueDescriptorImpl) ((WatchItemDescriptor) myValueDescriptor).getModifier().getInspectItem(getProject());
+              inspectDescriptor = (ValueDescriptorImpl)((WatchItemDescriptor)myValueDescriptor).getModifier().getInspectItem(getProject());
             }
             EvaluationContextImpl evaluationContext = ((JavaStackFrame)frame).getFrameDebuggerContext().createEvaluationContext();
             if (evaluationContext != null) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
index f7f05fcc496f..e66990a04775 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
@@ -192,7 +192,7 @@ public class ArrayRenderer extends NodeRendererImpl{
 
         if(!myForced && END_INDEX < array.length() - 1) {
           //children.add(nodeManager.createMessageNode(new MessageDescriptor(MORE_ELEMENTS, MessageDescriptor.SPECIAL)));
-          builder.setRemaining(array.length()-END_INDEX);
+          builder.setRemaining(array.length()-1-END_INDEX);
         }
       }
     }
diff --git a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
index ed439c6c2b70..2b38f1a281f6 100644
--- a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
+++ b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,5 @@
  */
 package com.intellij.ide.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
-
-public class TemplateProjectStructureAction extends AnAction implements DumbAware {
-  @Override
-  public void actionPerformed(final AnActionEvent e) {
-    ShowStructureSettingsAction.showDialog(ProjectManagerEx.getInstanceEx().getDefaultProject());
-  }
+public class TemplateProjectStructureAction extends ShowStructureSettingsAction {
 }
\ No newline at end of file
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
index 43282b614544..d1c5d9bec832 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
@@ -260,7 +260,7 @@ public class HighlightControlFlowUtil {
     }
     else {
       PsiElement scope = variable instanceof PsiField
-                               ? variable.getContainingFile()
+                               ? ((PsiField)variable).getContainingClass()
                                : variable.getParent() != null ? variable.getParent().getParent() : null;
       if (scope instanceof PsiCodeBlock && scope.getParent() instanceof PsiSwitchStatement) {
         scope = PsiTreeUtil.getParentOfType(scope, PsiCodeBlock.class);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
index 39098b51d8f8..88df46359853 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
@@ -17,6 +17,7 @@ package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.ChangeContextUtil;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
 import com.intellij.codeInsight.intention.HighPriorityAction;
@@ -208,6 +209,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
       if (element instanceof PsiNewExpression) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
         final PsiAnonymousClass anonymousClass = ((PsiNewExpression)element).getAnonymousClass();
         
         LOG.assertTrue(anonymousClass != null);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
index 2f9f4f883648..fb3c6183889f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -115,6 +116,7 @@ public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalI
       public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
         final PsiElement element = descriptor.getPsiElement();
         if (element instanceof PsiNewExpression) {
+          if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
           final PsiAnonymousClass anonymousClass = ((PsiNewExpression)element).getAnonymousClass();
           if (anonymousClass == null) return;
           final PsiMethod[] methods = anonymousClass.getMethods();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
index 08bb3413f313..b39171e76b89 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.intention.HighPriorityAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -94,7 +95,9 @@ public class ExplicitTypeCanBeDiamondInspection extends BaseJavaBatchLocalInspec
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      PsiDiamondTypeUtil.replaceExplicitWithDiamond(descriptor.getPsiElement());
+      final PsiElement element = descriptor.getPsiElement();
+      if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
+      PsiDiamondTypeUtil.replaceExplicitWithDiamond(element);
     }
   }
 }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
index b8c3908d392c..8b9d7f76917e 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -390,6 +391,7 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
+      if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
       final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class);
       if (lambdaExpression == null) return;
       final PsiType functionalInterfaceType = lambdaExpression.getFunctionalInterfaceType();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
index d4812f0bced7..d464e9cc45a4 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.AnnotationUtil;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
 import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
@@ -133,6 +134,7 @@ public class PossibleHeapPollutionVarargsInspection extends BaseJavaBatchLocalIn
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement psiElement = descriptor.getPsiElement();
       if (psiElement instanceof PsiIdentifier) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(psiElement)) return;
         final PsiMethod psiMethod = (PsiMethod)psiElement.getParent();
         psiMethod.getModifierList().setModifierProperty(PsiModifier.FINAL, true);
         new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
index 7a96ab1cc8bc..38bd06bba509 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.intention.HighPriorityAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -158,6 +159,7 @@ public class RedundantLambdaCodeBlockInspection extends BaseJavaBatchLocalInspec
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       final PsiElement element = descriptor.getPsiElement();
       if (element != null) {
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
         final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class);
         if (lambdaExpression != null) {
           final PsiElement body = lambdaExpression.getBody();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index 6572fd309b78..d9358980c78f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -470,7 +470,7 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
                             ? InspectionsBundle.message("dataflow.message.return.null.from.notnullable", presentableNullable)
                             : InspectionsBundle.message("dataflow.message.return.nullable.from.notnullable", presentableNullable);
         final LocalQuickFix[] fixes =
-          PsiTreeUtil.skipParentsOfType(expr, PsiCodeBlock.class, PsiReturnStatement.class) instanceof PsiLambdaExpression
+          PsiTreeUtil.getParentOfType(expr, PsiMethod.class, PsiLambdaExpression.class) instanceof PsiLambdaExpression
           ? LocalQuickFix.EMPTY_ARRAY
           : new LocalQuickFix[]{ new AnnotateMethodFix(defaultNullable, ArrayUtil.toStringArray(manager.getNotNulls())) {
             @Override
diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
index f4ad6bf6e954..37332ff434dc 100644
--- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
@@ -168,6 +168,10 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
       String groupName = ApplicationBundle.message("wrapping.fields.annotation");
       consumer.showCustomOption(JavaCodeStyleSettings.class, "DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION", "Do not wrap after single annotation", groupName);
     }
+    else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) {
+      consumer.showAllStandardOptions();
+      consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER", ApplicationBundle.message("editbox.blanklines.around.initializer"), CodeStyleSettingsCustomizable.BLANK_LINES);
+    }
     else {
       consumer.showAllStandardOptions();
     }
diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
index 8024f7bcd335..7ea13ffd9646 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
@@ -35,4 +35,6 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings {
   public int ANNOTATION_PARAMETER_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
   public boolean ALIGN_MULTILINE_ANNOTATION_PARAMETERS = false;
 
+  public int BLANK_LINES_AROUND_INITIALIZER = 1;
+
 }
diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
index 21d2e1881d05..f4e54f9b7724 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
@@ -341,31 +341,11 @@ public class JavaArrangementVisitor extends JavaRecursiveElementVisitor {
 
   @Override
   public void visitClassInitializer(PsiClassInitializer initializer) {
-    JavaElementArrangementEntry entry = createNewEntry(initializer, initializer.getTextRange(), FIELD, null, true);
+    JavaElementArrangementEntry entry = createNewEntry(initializer, initializer.getTextRange(), INIT_BLOCK, null, true);
     if (entry == null) {
       return;
     }
-
-    PsiElement classLBrace = null;
-    PsiClass clazz = initializer.getContainingClass();
-    if (clazz != null) {
-      classLBrace = clazz.getLBrace();
-    }
-    for (PsiElement e = initializer.getPrevSibling(); e != null; e = e.getPrevSibling()) {
-      JavaElementArrangementEntry prevEntry;
-      if (e == classLBrace) {
-        prevEntry = myEntries.get(clazz);
-      }
-      else {
-        prevEntry = myEntries.get(e);
-      }
-      if (prevEntry != null) {
-        entry.addDependency(prevEntry);
-      }
-      if (!(e instanceof PsiWhiteSpace)) {
-        break;
-      }
-    }
+    parseModifiers(initializer.getModifierList(), entry);
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
index 0baf085c6f64..8e79d7e67eff 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
 import com.intellij.psi.codeStyle.arrangement.engine.ArrangementEngine;
 import com.intellij.psi.codeStyle.arrangement.group.ArrangementGroupingRule;
 import com.intellij.psi.codeStyle.arrangement.match.ArrangementEntryMatcher;
@@ -36,6 +37,7 @@ import com.intellij.psi.codeStyle.arrangement.model.ArrangementAtomMatchConditio
 import com.intellij.psi.codeStyle.arrangement.model.ArrangementCompositeMatchCondition;
 import com.intellij.psi.codeStyle.arrangement.model.ArrangementMatchCondition;
 import com.intellij.psi.codeStyle.arrangement.std.*;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -62,7 +64,7 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
   // Type
   @NotNull private static final Set<ArrangementSettingsToken>                                SUPPORTED_TYPES     =
     ContainerUtilRt.newLinkedHashSet(
-      FIELD, CONSTRUCTOR, METHOD, CLASS, INTERFACE, ENUM, GETTER, SETTER, OVERRIDDEN
+      FIELD, INIT_BLOCK, CONSTRUCTOR, METHOD, CLASS, INTERFACE, ENUM, GETTER, SETTER, OVERRIDDEN
     );
   // Modifier
   @NotNull private static final Set<ArrangementSettingsToken>                                SUPPORTED_MODIFIERS =
@@ -79,6 +81,9 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
   @NotNull private static final Collection<Set<ArrangementSettingsToken>>                    MUTEXES             =
     ContainerUtilRt.newArrayList();
 
+  private static final Set<ArrangementSettingsToken> TYPES_WITH_DISABLED_ORDER = ContainerUtil.newHashSet();
+  private static final Set<ArrangementSettingsToken> TYPES_WITH_DISABLED_NAME_MATCH = ContainerUtil.newHashSet();
+
   static {
     Set<ArrangementSettingsToken> visibilityModifiers = ContainerUtilRt.newHashSet(PUBLIC, PROTECTED, PACKAGE_PRIVATE, PRIVATE);
     MUTEXES.add(visibilityModifiers);
@@ -96,6 +101,11 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     MODIFIERS_BY_TYPE.put(GETTER, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
     MODIFIERS_BY_TYPE.put(SETTER, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
     MODIFIERS_BY_TYPE.put(OVERRIDDEN, ContainerUtilRt.<ArrangementSettingsToken>newHashSet());
+    MODIFIERS_BY_TYPE.put(INIT_BLOCK, ContainerUtilRt.newHashSet(STATIC));
+
+    TYPES_WITH_DISABLED_ORDER.add(INIT_BLOCK);
+
+    TYPES_WITH_DISABLED_NAME_MATCH.add(INIT_BLOCK);
   }
 
   private static final Map<ArrangementSettingsToken, List<ArrangementSettingsToken>> GROUPING_RULES = ContainerUtilRt.newLinkedHashMap();
@@ -129,6 +139,8 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     for (ArrangementSettingsToken modifier : visibility) {
       and(matchRules, FIELD, STATIC, modifier);
     }
+    and(matchRules, INIT_BLOCK, STATIC);
+
     for (ArrangementSettingsToken modifier : visibility) {
       and(matchRules, FIELD, FINAL, modifier);
     }
@@ -136,6 +148,7 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
       and(matchRules, FIELD, modifier);
     }
     and(matchRules, FIELD);
+    and(matchRules, INIT_BLOCK);
     and(matchRules, CONSTRUCTOR);
     and(matchRules, METHOD, STATIC);
     and(matchRules, METHOD);
@@ -304,10 +317,14 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     }
 
     CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaLanguage.INSTANCE);
+    JavaCodeStyleSettings javaSettings = settings.getCustomSettings(JavaCodeStyleSettings.class);
     if (FIELD.equals(target.getType())) {
       if (parent != null && parent.getType() == INTERFACE) {
         return commonSettings.BLANK_LINES_AROUND_FIELD_IN_INTERFACE;
       }
+      else if (INIT_BLOCK.equals(previous.getType())) {
+        return javaSettings.BLANK_LINES_AROUND_INITIALIZER;
+      }
       else {
         return commonSettings.BLANK_LINES_AROUND_FIELD;
       }
@@ -323,6 +340,9 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     else if (CLASS.equals(target.getType())) {
       return commonSettings.BLANK_LINES_AROUND_CLASS;
     }
+    else if (INIT_BLOCK.equals(target.getType())) {
+      return javaSettings.BLANK_LINES_AROUND_INITIALIZER;
+    }
     else {
       return -1;
     }
@@ -363,9 +383,10 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
 
   @Override
   public boolean isEnabled(@NotNull ArrangementSettingsToken token, @Nullable ArrangementMatchCondition current) {
-    if (SUPPORTED_TYPES.contains(token) || SUPPORTED_ORDERS.contains(token) || StdArrangementTokens.Regexp.NAME.equals(token)) {
+    if (SUPPORTED_TYPES.contains(token)) {
       return true;
     }
+
     ArrangementSettingsToken type = null;
     if (current != null) {
       type = ArrangementUtil.parseType(current);
@@ -373,6 +394,15 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
     if (type == null) {
       type = NO_TYPE;
     }
+
+    if (SUPPORTED_ORDERS.contains(token)) {
+      return !TYPES_WITH_DISABLED_ORDER.contains(type);
+    }
+
+    if (StdArrangementTokens.Regexp.NAME.equals(token)) {
+      return !TYPES_WITH_DISABLED_NAME_MATCH.contains(type);
+    }
+
     Set<ArrangementSettingsToken> modifiers = MODIFIERS_BY_TYPE.get(type);
     return modifiers != null && modifiers.contains(token);
   }
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index a49cede74175..c092223ea47a 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -39,6 +39,7 @@ import com.intellij.psi.impl.source.tree.java.ClassElement;
 import com.intellij.psi.jsp.JspElementType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -90,6 +91,8 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
 
   private final JavaWrapManager myWrapManager;
   private final AlignmentInColumnsHelper myAlignmentInColumnsHelper;
+  private Map<IElementType, Wrap> myPreferredWraps;
+  private AbstractJavaBlock myParentBlock;
 
   protected AbstractJavaBlock(@NotNull final ASTNode node,
                               final Wrap wrap,
@@ -505,12 +508,9 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
                                   mySettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS);
       }
       else if (childType == JavaTokenType.LPARENTH && nodeType == JavaElementType.PARAMETER_LIST) {
-        // There is a possible case that particular annotated method definition is too long. We may wrap either after annotation
-        // or after opening lbrace then. Our strategy is to wrap after annotation whenever possible.
-        Wrap wrap = Wrap.createWrap(getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
-        child = processParenthesisBlock(result, child,
-                                  WrappingStrategy.createDoNotWrapCommaStrategy(wrap),
-                                  mySettings.ALIGN_MULTILINE_PARAMETERS);
+        Wrap wrapToUse = getMethodParametersWrap();
+        WrappingStrategy wrapStrategy = WrappingStrategy.createDoNotWrapCommaStrategy(wrapToUse);
+        child = processParenthesisBlock(result, child, wrapStrategy, mySettings.ALIGN_MULTILINE_PARAMETERS);
       }
       else if (childType == JavaTokenType.LPARENTH && nodeType == JavaElementType.RESOURCE_LIST) {
         Wrap wrap = Wrap.createWrap(getWrapType(mySettings.RESOURCE_LIST_WRAP), false);
@@ -572,6 +572,25 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
     return child;
   }
 
+  @NotNull
+  private Wrap getMethodParametersWrap() {
+    Wrap preferredWrap = getModifierListWrap();
+    if (preferredWrap == null) {
+      return Wrap.createWrap(getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
+    } else {
+      return Wrap.createChildWrap(preferredWrap, getWrapType(mySettings.METHOD_PARAMETERS_WRAP), false);
+    }
+  }
+
+  @Nullable
+  private Wrap getModifierListWrap() {
+    AbstractJavaBlock parentBlock = getParentBlock();
+    if (parentBlock != null) {
+      return parentBlock.getReservedWrap(JavaElementType.MODIFIER_LIST);
+    }
+    return null;
+  }
+
   private ASTNode processField(@NotNull final List<Block> result,
                                ASTNode child,
                                @NotNull final AlignmentStrategy alignmentStrategy,
@@ -1135,7 +1154,7 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
   @Nullable
   @Override
   public Wrap getReservedWrap(IElementType elementType) {
-    return null;
+    return myPreferredWraps != null ? myPreferredWraps.get(elementType) : null;
   }
 
   /**
@@ -1150,7 +1169,11 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
    * @param reservedWrap    reserved wrap instance
    * @param operationType   target operation type to associate with the given wrap instance
    */
-  protected void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+  public void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+    if (myPreferredWraps == null) {
+      myPreferredWraps = ContainerUtil.newHashMap();
+    }
+    myPreferredWraps.put(operationType, reservedWrap);
   }
 
   @Nullable
@@ -1262,6 +1285,14 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
     return null;
   }
 
+  public AbstractJavaBlock getParentBlock() {
+    return myParentBlock;
+  }
+
+  public void setParentBlock(@NotNull AbstractJavaBlock parentBlock) {
+    myParentBlock = parentBlock;
+  }
+
   /**
    * Allows to answer if special 'variable declaration alignment' strategy should be used for the given node.
    * I.e. given node is supposed to be parent node of sub-nodes that should be aligned 'by-columns'.
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
index a97d6d12646f..098993124bdf 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/BlockContainingJavaBlock.java
@@ -61,8 +61,13 @@ public class BlockContainingJavaBlock extends AbstractJavaBlock{
 
     buildChildren(result, childAlignment, childWrap);
 
-    return result;
+    for (Block block : result) {
+      if (block instanceof AbstractJavaBlock) {
+        ((AbstractJavaBlock)block).setParentBlock(this);
+      }
+    }
 
+    return result;
   }
 
   private void buildChildren(final ArrayList<Block> result, final Alignment childAlignment, final Wrap childWrap) {
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
index 84c15d5db1a9..8a89027e2d56 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
@@ -425,13 +425,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
         myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
       }
       else if (myRole1 == ChildRole.FIELD) {
-        int lines = Math.max(getLinesAroundField(), getLinesAroundMethod()) + 1;
-        // IJ has been keeping initialization block which starts at the same line as a field for a while.
-        // However, it's not convenient for a situation when particular code is created via PSI - it's easier to not bothering
-        // with whitespace elements when inserting, say, new initialization blocks. That's why we don't enforce new line
-        // only during explicit reformatting ('Reformat' action).
-        //int minLineFeeds = FormatterUtil.isFormatterCalledExplicitly() ? 0 : 1;
-        myResult = Spacing.createSpacing(0, mySettings.SPACE_BEFORE_CLASS_LBRACE ? 1 : 0, 1, true, mySettings.KEEP_BLANK_LINES_BEFORE_RBRACE, lines);
+        int blankLines = myJavaSettings.BLANK_LINES_AROUND_INITIALIZER + 1;
+        myResult = Spacing.createSpacing(0, mySettings.SPACE_BEFORE_CLASS_LBRACE ? 1 : 0, blankLines, true, mySettings.KEEP_BLANK_LINES_BEFORE_RBRACE);
       }
       else if (myRole1 == ChildRole.CLASS) {
         setAroundClassSpacing();
@@ -450,7 +445,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
         setAroundClassSpacing();
       }
       else {
-        final int blankLines = getLinesAroundMethod() + 1;
+        final int blankLines = myJavaSettings.BLANK_LINES_AROUND_INITIALIZER + 1;
         myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, blankLines, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_DECLARATIONS);
       }
     }
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
index c74b9c05b19b..478f8ba8d065 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
@@ -127,7 +127,7 @@ public class SimpleJavaBlock extends AbstractJavaBlock {
   }
 
   @Override
-  protected void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
+  public void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) {
     myReservedWrap.put(operationType, reservedWrap);
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
index 50bbcbc3b5d6..54965f9eca1e 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java
@@ -19,8 +19,8 @@ import com.intellij.formatting.ASTBlock;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.Wrap;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.formatter.java.AbstractJavaBlock;
 import com.intellij.psi.formatter.java.wrap.impl.JavaChildBlockWrapFactory;
 import com.intellij.psi.formatter.java.wrap.impl.JavaChildWrapArranger;
 import org.jetbrains.annotations.Nullable;
@@ -79,7 +79,7 @@ public class JavaWrapManager {
    */
   @Nullable
   public Wrap arrangeChildWrap(ASTNode child, ASTNode parent, CommonCodeStyleSettings settings, Wrap suggestedWrap,
-                               ReservedWrapsProvider reservedWrapsProvider) 
+                               AbstractJavaBlock reservedWrapsProvider)
   {
     return myChildArranger.arrange(child, parent, settings, suggestedWrap, reservedWrapsProvider);
   }
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
index 5b05ced2d5a1..579e9ae86180 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildWrapArranger.java
@@ -22,6 +22,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
+import com.intellij.psi.formatter.java.AbstractJavaBlock;
 import com.intellij.psi.formatter.java.JavaFormatterUtil;
 import com.intellij.psi.formatter.java.wrap.JavaWrapManager;
 import com.intellij.psi.formatter.java.wrap.ReservedWrapsProvider;
@@ -70,7 +71,7 @@ public class JavaChildWrapArranger {
                       ASTNode parent,
                       CommonCodeStyleSettings settings,
                       Wrap suggestedWrap,
-                      ReservedWrapsProvider reservedWrapsProvider) {
+                      AbstractJavaBlock reservedWrapsProvider) {
     final JavaCodeStyleSettings javaSettings = settings.getRootSettings().getCustomSettings(JavaCodeStyleSettings.class);
     ASTNode directParent = child.getTreeParent();
     int role = ((CompositeElement)directParent).getChildRole(child);
@@ -188,8 +189,9 @@ public class JavaChildWrapArranger {
         if (javaSettings.DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION && isFieldModifierListWithSingleAnnotation(parent)) {
           return Wrap.createWrap(WrapType.NONE, false);
         }
-
-        return Wrap.createWrap(getWrapType(getAnnotationWrapType(parent.getTreeParent(), child, settings)), true);
+        Wrap wrap = Wrap.createWrap(getWrapType(getAnnotationWrapType(parent.getTreeParent(), child, settings)), true);
+        putPreferredWrapInParentBlock(reservedWrapsProvider, wrap);
+        return wrap;
       }
 
       return null;
@@ -263,6 +265,13 @@ public class JavaChildWrapArranger {
     return suggestedWrap;
   }
 
+  private static void putPreferredWrapInParentBlock(@NotNull AbstractJavaBlock block, @NotNull Wrap preferredWrap) {
+    AbstractJavaBlock parentBlock = block.getParentBlock();
+    if (parentBlock != null) {
+      parentBlock.setReservedWrap(preferredWrap, JavaElementType.MODIFIER_LIST);
+    }
+  }
+
   private static boolean isFieldModifierListWithSingleAnnotation(@NotNull ASTNode elem) {
     ASTNode parent = elem.getTreeParent();
     if (parent != null && parent.getElementType() == JavaElementType.FIELD) {
diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
index 968b537bb71d..c008f7f7a609 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
@@ -92,12 +92,28 @@ public class ExtractLightMethodObjectHandler {
     final TextRange range = originalContext.getTextRange();
     final PsiElement originalAnchor =
       CodeInsightUtil.findElementInRange(copy, range.getStartOffset(), range.getEndOffset(), originalContext.getClass());
-    //todo before this or super, not found etc
-    final PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
-    if (anchor == null) {
+
+    final PsiClass containingClass = PsiTreeUtil.getParentOfType(originalAnchor, PsiClass.class);
+    if (containingClass == null) {
       return null;
     }
-    final PsiElement container = anchor.getParent();
+
+    PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
+    if (anchor == null) {
+      if (PsiTreeUtil.getParentOfType(originalAnchor, PsiCodeBlock.class) != null) {
+        anchor = originalAnchor;
+      }
+    }
+
+    final PsiElement container;
+    if (anchor == null) {
+      container = ((PsiClassInitializer)containingClass.add(elementFactory.createClassInitializer())).getBody();
+      anchor = container.getLastChild();
+    }
+    else {
+      container = anchor.getParent();
+    }
+
     final PsiElement firstElementCopy = container.addRangeBefore(elements[0], elements[elements.length - 1], anchor);
     final PsiElement[] elementsCopy = CodeInsightUtil.findStatementsInRange(copy,
                                                                             firstElementCopy.getTextRange().getStartOffset(),
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index a411917b5255..d181d3c49351 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -870,16 +870,22 @@ public class RefactoringUtil {
       JavaCodeStyleManager.getInstance(declaration.getProject()).shortenClassReferences(declaration);
       if (loopBodyCopy != null) codeBlock.add(loopBodyCopy);
     } else if (container instanceof PsiLambdaExpression) {
-      final PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)container;
-      final PsiElement lambdaExpressionBody = lambdaExpression.getBody();
-      LOG.assertTrue(lambdaExpressionBody != null);
+      PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)container;
+      final PsiElement invalidBody = lambdaExpression.getBody();
+      if (invalidBody == null) return declaration;
 
       final PsiLambdaExpression expressionFromText = (PsiLambdaExpression)elementFactory
-        .createExpressionFromText(lambdaExpression.getParameterList().getText() + " -> {}", lambdaExpression);
+        .createExpressionFromText(lambdaExpression.getParameterList().getText() + " -> {}", lambdaExpression.getParent());
       PsiCodeBlock newBody = (PsiCodeBlock)expressionFromText.getBody();
       LOG.assertTrue(newBody != null);
       newBody.add(declaration);
 
+      lambdaExpression =
+        (PsiLambdaExpression)lambdaExpression.replace(elementFactory.createExpressionFromText(
+          lambdaExpression.getParameterList().getText() + " -> " + invalidBody.getText(), lambdaExpression));
+
+      final PsiElement lambdaExpressionBody = lambdaExpression.getBody();
+      LOG.assertTrue(lambdaExpressionBody != null);
       final PsiStatement lastBodyStatement;
       if (LambdaUtil.getFunctionalInterfaceReturnType(lambdaExpression) == PsiType.VOID) {
         lastBodyStatement = elementFactory.createStatementFromText("a;", lambdaExpression);
diff --git a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
index 0818ea4e41a0..c49580e97c85 100644
--- a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
@@ -255,41 +255,55 @@ public class GenericsUtil {
                                                                                 final PsiSubstitutor substitutor,
                                                                                 final PsiElement context,
                                                                                 final boolean allowUncheckedConversion) {
-    nextTypeParam:
     for (PsiTypeParameter typeParameter : typeParams) {
-      PsiType substituted = substitutor.substitute(typeParameter);
-      if (substituted == null) return null;
-      if (context != null) {
-        substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+      PsiType boundError = findTypeParameterBoundError(typeParameter, typeParameter.getExtendsListTypes(),
+                                                       substitutor, context, allowUncheckedConversion);
+      if (boundError != null) {
+        return Pair.create(typeParameter, boundError);
       }
+    }
+    return null;
+  }
 
-      PsiClassType[] extendsTypes = typeParameter.getExtendsListTypes();
-      for (PsiClassType type : extendsTypes) {
-        PsiType extendsType = substitutor.substitute(type);
-        if (substituted instanceof PsiWildcardType) {
-          if (((PsiWildcardType)substituted).isSuper()) {
-            continue;
-          }
-          final PsiType extendsBound = ((PsiWildcardType)substituted).getExtendsBound();
-          if (acceptExtendsBound(extendsType, extendsBound)) {
-            continue nextTypeParam;
-          }
+  public static PsiType findTypeParameterBoundError(PsiTypeParameter typeParameter,
+                                                    PsiType[] extendsTypes,
+                                                    PsiSubstitutor substitutor,
+                                                    PsiElement context,
+                                                    boolean allowUncheckedConversion) {
+    PsiType substituted = substitutor.substitute(typeParameter);
+    if (substituted == null) return null;
+    if (context != null) {
+      substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+    }
+
+    if (substituted instanceof PsiWildcardType) {
+      if (((PsiWildcardType)substituted).isSuper()) {
+        return null;
+      }
+    }
+
+    for (PsiType type : extendsTypes) {
+      PsiType extendsType = substitutor.substitute(type);
+      if (substituted instanceof PsiWildcardType) {
+        final PsiType extendsBound = ((PsiWildcardType)substituted).getExtendsBound();
+        if (acceptExtendsBound(extendsType, extendsBound)) {
+          return null;
         }
-        else if (substituted instanceof PsiIntersectionType) {
-          for (PsiType extendsBound : ((PsiIntersectionType)substituted).getConjuncts()) {
-            if (acceptExtendsBound(extendsType, extendsBound)) continue nextTypeParam;
-          }
+      }
+      else if (substituted instanceof PsiIntersectionType) {
+        for (PsiType extendsBound : ((PsiIntersectionType)substituted).getConjuncts()) {
+          if (acceptExtendsBound(extendsType, extendsBound)) return null;
         }
-        else if (substituted instanceof PsiCapturedWildcardType) {
-          final PsiType extendsBound = ((PsiCapturedWildcardType)substituted).getUpperBound();
-          if (acceptExtendsBound(extendsType, extendsBound)) {
-            continue nextTypeParam;
-          }
-        }
-        if (extendsType != null && !TypeConversionUtil.isAssignable(extendsType, substituted, allowUncheckedConversion)) {
-          return Pair.create(typeParameter, extendsType);
+      }
+      else if (substituted instanceof PsiCapturedWildcardType) {
+        final PsiType extendsBound = ((PsiCapturedWildcardType)substituted).getUpperBound();
+        if (acceptExtendsBound(extendsType, extendsBound)) {
+          return null;
         }
       }
+      if (extendsType != null && !TypeConversionUtil.isAssignable(extendsType, substituted, allowUncheckedConversion)) {
+        return extendsType;
+      }
     }
     return null;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
index 51350e124dd3..22beb02e68b8 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
@@ -254,12 +254,12 @@ public class InferenceSession {
       }
     }
 
-    final PsiSubstitutor substitutor = resolveBounds(myInferenceVariables, mySiteSubstitutor);
+    final PsiSubstitutor substitutor = resolveBounds(myInferenceVariables, PsiSubstitutor.EMPTY);
     if (substitutor != null) {
       if (myContext != null) {
         myContext.putUserData(ERASED, myErased);
       }
-      mySiteSubstitutor = substitutor;
+      mySiteSubstitutor = mySiteSubstitutor.putAll(substitutor);
       for (InferenceVariable variable : myInferenceVariables) {
         variable.setInstantiation(substitutor.substitute(variable.getParameter()));
       }
@@ -403,7 +403,7 @@ public class InferenceSession {
   }
 
   public PsiSubstitutor retrieveNonPrimitiveEqualsBounds(Collection<InferenceVariable> variables) {
-    PsiSubstitutor substitutor = mySiteSubstitutor;
+    PsiSubstitutor substitutor = PsiSubstitutor.EMPTY;
     for (InferenceVariable variable : variables) {
       final PsiType equalsBound = getEqualsBound(variable, substitutor);
       if (!(equalsBound instanceof PsiPrimitiveType)) {
@@ -751,6 +751,22 @@ public class InferenceSession {
     return isProperType(bound) ? bound : substitutor.substitute(bound);
   }
 
+  private static boolean hasBoundProblems(final List<InferenceVariable> typeParams,
+                                          final PsiSubstitutor substitutor,
+                                          final PsiElement context) {
+    for (InferenceVariable typeParameter : typeParams) {
+      if (typeParameter.getCallContext() != context) {
+        continue;
+      }
+      final List<PsiType> extendsTypes = typeParameter.getBounds(InferenceBound.UPPER);
+      final PsiType[] bounds = extendsTypes.toArray(new PsiType[extendsTypes.size()]);
+      if (GenericsUtil.findTypeParameterBoundError(typeParameter, bounds, substitutor, context, true) != null) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private PsiSubstitutor resolveBounds(final Collection<InferenceVariable> inferenceVariables,
                                        PsiSubstitutor substitutor) {
     final Collection<InferenceVariable> allVars = new ArrayList<InferenceVariable>(inferenceVariables);
@@ -759,8 +775,7 @@ public class InferenceSession {
       if (!myIncorporationPhase.hasCaptureConstraints(vars)) {
         PsiSubstitutor firstSubstitutor = resolveSubset(vars, substitutor);
         if (firstSubstitutor != null) {
-          final Set<PsiTypeParameter> parameters = firstSubstitutor.getSubstitutionMap().keySet();
-          if (GenericsUtil.findTypeParameterWithBoundError(parameters.toArray(new PsiTypeParameter[parameters.size()]), firstSubstitutor, myContext, true) != null) {
+          if (hasBoundProblems(vars, firstSubstitutor, myContext)) {
             firstSubstitutor = null;
           }
         }
@@ -837,7 +852,7 @@ public class InferenceSession {
     for (InferenceVariable var : vars) {
       LOG.assertTrue(var.getInstantiation() == PsiType.NULL);
       final PsiTypeParameter typeParameter = var.getParameter();
-      if (substitutor.getSubstitutionMap().containsKey(typeParameter) && var.getCallContext() != myContext) {
+      if (substitutor.putAll(mySiteSubstitutor).getSubstitutionMap().containsKey(typeParameter) && var.getCallContext() != myContext) {
         continue;//todo
       }
 
@@ -849,7 +864,7 @@ public class InferenceSession {
           type =  PsiType.getJavaLangRuntimeException(myManager, GlobalSearchScope.allScope(myManager.getProject()));
         }
         else {
-          if (substitutor.getSubstitutionMap().get(typeParameter) != null) continue;
+          if (substitutor.putAll(mySiteSubstitutor).getSubstitutionMap().get(typeParameter) != null) continue;
           type = myErased ? null : getUpperBound(var, substitutor);
         }
       }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
index b59cf70bdb69..f7b73ba5eee2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
@@ -90,13 +90,9 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
         if (method != null && !method.isConstructor()) {
           returnType = method.getReturnType();
           if (returnType != null) {
-            List<PsiTypeParameter> params = new ArrayList<PsiTypeParameter>();
-            for (PsiTypeParameter parameter : PsiUtil.typeParametersIterable(method)) {
-              params.add(parameter);
-            }
-            typeParams = params.toArray(new PsiTypeParameter[params.size()]);
+            typeParams = method.getTypeParameters();
           }
-        } else if (myExpression instanceof PsiNewExpression) {  //default constructor
+        } else if (myExpression instanceof PsiNewExpression) {
           final PsiJavaCodeReferenceElement classReference = ((PsiNewExpression)myExpression).getClassOrAnonymousClassReference();
           if (classReference != null) {
             final PsiElement psiClass = classReference.resolve();
@@ -108,7 +104,9 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
         }
 
         if (typeParams != null) {
-          final InferenceSession callSession = new InferenceSession(typeParams, PsiSubstitutor.EMPTY, myExpression.getManager(), myExpression);
+          PsiSubstitutor siteSubstitutor =
+            resolveResult instanceof MethodCandidateInfo && method != null && !method.isConstructor() ? ((MethodCandidateInfo)resolveResult).getSiteSubstitutor() : PsiSubstitutor.EMPTY;
+          final InferenceSession callSession = new InferenceSession(typeParams, siteSubstitutor, myExpression.getManager(), myExpression);
           callSession.propagateVariables(session.getInferenceVariables());
           if (method != null) {
             final PsiExpression[] args = argumentList.getExpressions();
@@ -120,7 +118,7 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
           if (!accepted) {
             return false;
           }
-          callSession.registerReturnTypeConstraints(returnType, myT);
+          callSession.registerReturnTypeConstraints(siteSubstitutor.substitute(returnType), myT);
           if (callSession.repeatInferencePhases(true)) {
             session.registerNestedSession(callSession);
           } else {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
index 62f1ff1d819c..03b20b3fb443 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
@@ -91,7 +91,7 @@ public class TypeEqualityConstraint implements ConstraintFormula {
       final PsiClassType.ClassResolveResult sResult = ((PsiClassType)myS).resolveGenerics();
       final PsiClass tClass = tResult.getElement();
       //equal erasure
-      if (tClass != null && tClass.equals(sResult.getElement())) {
+      if (tClass != null && tClass.getManager().areElementsEquivalent(tClass, sResult.getElement())) {
         final PsiSubstitutor tSubstitutor = tResult.getSubstitutor();
         final PsiSubstitutor sSubstitutor = sResult.getSubstitutor();
         for (PsiTypeParameter typeParameter : tClass.getTypeParameters()) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java
new file mode 100644
index 000000000000..c8e80cc743c4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/advHighlighting/FinalVariableMightNotHaveBeenInitializedInsideLambda.java
@@ -0,0 +1,66 @@
+class Test {
+  final Runnable runnable;
+
+  {
+    runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+  }
+
+  final Runnable runnable1;
+  {
+    runnable1 = new Runnable() {
+      @Override
+      public void run() {
+        System.out.println(runnable1);
+      }
+    };
+  }
+
+}
+
+abstract class TestInnerAnonymous {
+
+
+  void foo() {
+    new Object() {
+      final Runnable runnable;
+
+      {
+        runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+      }
+
+      final Runnable runnable1;
+
+      {
+        runnable1 = new Runnable() {
+          @Override
+          public void run() {
+            System.out.println(runnable1);
+          }
+        };
+      }
+
+    };
+  }
+
+
+  private static class MyObject {
+    final Runnable runnable;
+
+    {
+      runnable = () -> System.out.println(<error descr="Variable 'runnable' might not have been initialized">runnable</error>);
+    }
+
+    final Runnable runnable1;
+
+    {
+      runnable1 = new Runnable() {
+        @Override
+        public void run() {
+          System.out.println(runnable1);
+        }
+      };
+    }
+
+  }
+}
+
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java
new file mode 100644
index 000000000000..927dc965042d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/SiteSubstitutionInExpressionConstraints.java
@@ -0,0 +1,49 @@
+import java.util.Map;
+import java.util.List;
+
+//expected type parameter
+class Sample<V> {
+
+  public <K> Map<V,  K> test() {
+    return null;
+  }
+
+  public <T> void fun(T t, V v) {
+  }
+
+  <M> M bar() {
+    return null;
+  }
+
+  void run(Sample<Integer> sample) {
+    fun(test(), bar());
+    sample.fun(test(), sample.bar());
+    sample.fun(test(), bar());
+    fun(test(), sample.bar());
+
+    fun(sample.test(), bar());
+    fun(sample.test(), sample.bar());
+    sample.fun(sample.test(), bar());
+    sample.fun(sample.test(), sample.bar());
+  }
+}
+
+//expected generic type
+class Sample1<T> {
+  public <S extends T> List<S> reverse() {
+    return null;
+  }
+
+  public void foo(Sample1<Comparable> t)
+  {
+    newTreeSet(t.reverse());
+    newTreeSet(reverse());
+
+    t.newTreeSet(t.reverse());
+    t.newTreeSet(reverse());
+  }
+
+
+  public <E> void newTreeSet(List<E> comparator) {}
+}
+
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
index 0696aadf6179..6b4de4e565a8 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
@@ -67,7 +67,7 @@ class MyTest1 {
     }
 
     public static void main(String[] args) {
-        m<error descr="Ambiguous method call: both 'MyTest1.m(I1)' and 'MyTest1.m(I2)' match">(Foo::new)</error>;
+        m<error descr="Ambiguous method call: both 'MyTest1.m(I2)' and 'MyTest1.m(I3)' match">(Foo::new)</error>;
     }
 }
 class MyTest2 {
@@ -104,6 +104,6 @@ class MyTest2 {
     }
 
     public static void main(String[] args) {
-        m<error descr="Ambiguous method call: both 'MyTest2.m(I1)' and 'MyTest2.m(I2)' match">(Foo::new)</error>;
+        m<error descr="Ambiguous method call: both 'MyTest2.m(I2)' and 'MyTest2.m(I3)' match">(Foo::new)</error>;
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java
new file mode 100644
index 000000000000..48a25567d205
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBrace.java
@@ -0,0 +1,10 @@
+class Sample {
+
+  void a() {
+    System.out.println("");
+  <caret>}
+
+  private int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java
new file mode 100644
index 000000000000..010af145aaca
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnClosingBraceLocalClass.java
@@ -0,0 +1,12 @@
+class Sample {
+
+  void a() {
+      class Local {
+
+      <caret>}
+  }
+
+  private int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java
new file mode 100644
index 000000000000..6436369d9d84
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnEmptyMethod.java
@@ -0,0 +1,7 @@
+class Sample {
+  static {<caret>}
+
+  int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java
new file mode 100644
index 000000000000..e1746e57ed23
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnFieldInitialization.java
@@ -0,0 +1,7 @@
+class Sample {
+  int <caret>i = 0;
+
+  int foo() {
+    return 1;
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java
new file mode 100644
index 000000000000..69d6f91a4643
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OnSuperConstructorCall.java
@@ -0,0 +1,9 @@
+class Sample {
+  public Sample() {
+    <caret>super();
+  }
+
+  int foo() {
+    return 1;
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java
new file mode 100644
index 000000000000..afdfb96db8e2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.after.java
@@ -0,0 +1,20 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        int m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((Object a) -> {
+            int c = 1;
+            return c;
+        });
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java
new file mode 100644
index 000000000000..3d54e3b88646
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBody.java
@@ -0,0 +1,17 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        int m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((Object a) -> <selection>1</selection>);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java
new file mode 100644
index 000000000000..6315c2590032
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.after.java
@@ -0,0 +1,20 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        void m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((a) -> {
+            int c = 1;
+            return c;
+        });
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java
new file mode 100644
index 000000000000..bdea215a08a4
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyVoidValueConflict.java
@@ -0,0 +1,17 @@
+class Foo {
+    interface I<T> {
+        T m(Object op);
+    }
+
+    interface J<T> {
+        void m(T o);
+    }
+
+
+    void f(J r) {}
+    void f(I<String> r) {}
+
+    {
+        f((a) -> <selection>1</selection>);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
index 538b833b5e3b..122e776fda9d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
@@ -172,6 +172,10 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
     doTest();
   }
 
+  public void testSiteSubstitutionInExpressionConstraints() throws Exception {
+    doTest();
+  }
+
   public void testIncorporationWithEqualsBoundsSubstitution() throws Exception {
     doTest();
   }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
index 08a2b63550ff..4ecf0b2b434e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java
@@ -39,6 +39,10 @@ public class LightAdvHighlightingJdk8Test extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testFinalVariableMightNotHaveBeenInitializedInsideLambda() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable());
     doTest(BASE_PATH + "/" + getTestName(false) + ".java", true, false);
diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
index 23f6d1b566c2..1cc9c93bc9c5 100644
--- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeAndModifierTest.groovy
@@ -83,9 +83,10 @@ class Test {
       expected: '''\
 class Test {
   public int j;
-  { j = 1; }
   protected int k;
   private int i;
+
+  { j = 1; }
 }''',
       rules: [rule(FIELD, PUBLIC), rule(FIELD, PROTECTED), rule(FIELD, PRIVATE)])
   }
@@ -101,10 +102,11 @@ class Test {
 }''',
       expected: '''\
 class Test {
-  { j = 1; }
   public int j;
   protected int k;
   private int i;
+
+  { j = 1; }
 }''',
       rules: [rule(FIELD, PUBLIC), rule(FIELD, PROTECTED), rule(FIELD, PRIVATE)])
   }
diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
index 7f15babc1e93..62fedc613f7f 100644
--- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/JavaRearrangerByTypeTest.groovy
@@ -569,4 +569,85 @@ class B extends A {
       rules: [rule(PUBLIC, METHOD), rule(PRIVATE, METHOD)]
     )
   }
+
+  void "test initializer block after fields"() {
+    doTest(
+      initial: '''\
+public class NewOneClass {
+
+    {
+        a = 1;
+    }
+
+    int a;
+
+    {
+        b = 5;
+    }
+
+    int b;
+
+}
+''',
+      expected: '''\
+public class NewOneClass {
+
+    int a;
+    int b;
+
+    {
+        a = 1;
+    }
+
+    {
+        b = 5;
+    }
+
+}
+''',
+      rules: [rule(FIELD), rule(INIT_BLOCK)]
+    )
+  }
+
+  void "test static initializer block"() {
+    doTest(
+      initial: '''\
+public class NewOneClass {
+
+    static {
+        a = 1;
+    }
+
+    static int a;
+
+    {
+        b = 5;
+    }
+
+    int b;
+
+}
+''',
+      expected: '''\
+public class NewOneClass {
+
+    static int a;
+
+    static {
+        a = 1;
+    }
+
+    int b;
+
+    {
+        b = 5;
+    }
+
+}
+''',
+      rules: [rule(STATIC, FIELD), rule(STATIC, INIT_BLOCK), rule(FIELD), rule(INIT_BLOCK)]
+    )
+  }
+
+
 }
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
index fe005a84db3f..e0c845d066c6 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBlankLinesTest.java
@@ -25,6 +25,7 @@ public class JavaFormatterBlankLinesTest extends AbstractJavaFormatterTest {
 
   public void testBlankLinesAroundClassInitializationBlock() throws Exception {
     getSettings().BLANK_LINES_AROUND_METHOD = 3;
+    getJavaSettings().BLANK_LINES_AROUND_INITIALIZER = 3;
     doTextTest(
       "class T {\n" +
       "    private final DecimalFormat fmt = new DecimalFormat();\n" +
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
index b16e23e83e37..fa960980d297 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
@@ -260,7 +260,6 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest {
     );
   }
 
-  @Bombed(user = "Roman Shevchenko", year = 2014, month = Calendar.MARCH, day = 14)
   public void testWrapMethodAnnotationBeforeParams() {
     // Inspired by IDEA-59536
     getSettings().RIGHT_MARGIN = 90;
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
index af1fee9363dc..d6440fd5de19 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
@@ -214,6 +214,56 @@ public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase {
            "    }", false);
   }
 
+  public void testOnClosingBrace() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnClosingBraceLocalClass() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnFieldInitialization() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnEmptyMethod() throws Exception {
+    doTest("   foo()", "int result = Test.invoke();",
+
+           "public static class Test {\n" +
+           "        public static int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
+  public void testOnSuperConstructorCall() throws Exception {
+    doTest("   foo()", "int result = new Test().invoke();",
+
+           "public class Test {\n" +
+           "        public int invoke() {\n" +
+           "            return foo();\n" +
+           "        }\n" +
+           "    }");
+  }
+
   @Override
   protected Sdk getProjectJDK() {
     return IdeaTestUtil.getMockJdk18();
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
index 4e993aac90aa..2e2a6cc488a3 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
@@ -437,6 +437,14 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
     doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
   }
 
+  public void testPutInLambdaBody() {
+    doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
+  }
+
+  public void testPutInLambdaBodyVoidValueConflict() {
+    doTest(new MockIntroduceVariableHandler("c", false, false, false, "int"));
+  }
+
   public void testNormalizeDeclarations() {
     doTest(new MockIntroduceVariableHandler("i3", false, false, false, "int"));
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java b/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
index 0717de1c61e7..514ec5efc8d4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/BasicFuture.java
@@ -15,14 +15,17 @@
  */
 package org.jetbrains.jps.api;
 
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Eugene Zhuravlev
  *         Date: 5/3/12
  */
-public class BasicFuture<T> implements Future<T> {
+public class BasicFuture<T> implements TaskFuture<T> {
   protected final Semaphore mySemaphore = new Semaphore(1);
   private final AtomicBoolean myDone = new AtomicBoolean(false);
   private final AtomicBoolean myCanceledState = new AtomicBoolean(false);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java
new file mode 100644
index 000000000000..c09c8446422b
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFuture.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jps.api;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+public interface TaskFuture<T> extends Future<T> {
+  void waitFor();
+
+  boolean waitFor(long timeout, TimeUnit unit);
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
index add3dfca0fbb..3274a7ef896c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
@@ -2347,6 +2347,13 @@ public class Mappings {
     }
   }
 
+  @Nullable
+  public Collection<File> getClassSources(int className) {
+    synchronized (myLock) {
+      return myClassToSourceFile.get(className);
+    }
+  }
+
   public void close() {
     synchronized (myLock) {
       myClassToSubclasses.close();
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
index 8a082740ebee..7837b954da81 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
@@ -16,6 +16,7 @@
 package org.jetbrains.jps.cmdline;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.io.FileSystemUtil;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import io.netty.bootstrap.Bootstrap;
@@ -35,7 +36,11 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.api.CmdlineProtoUtil;
 import org.jetbrains.jps.api.CmdlineRemoteProto;
 import org.jetbrains.jps.api.GlobalOptions;
+import org.jetbrains.jps.incremental.MessageHandler;
 import org.jetbrains.jps.incremental.Utils;
+import org.jetbrains.jps.incremental.fs.BuildFSState;
+import org.jetbrains.jps.incremental.fs.FSState;
+import org.jetbrains.jps.incremental.messages.BuildMessage;
 import org.jetbrains.jps.service.SharedThreadPool;
 
 import java.io.*;
@@ -49,6 +54,9 @@ import java.util.concurrent.TimeUnit;
  */
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class BuildMain {
+  private static final String PRELOAD_PROJECT_PATH = "preload.project.path";
+  private static final String PRELOAD_CONFIG_PATH = "preload.config.path";
+  
   private static final String LOG_CONFIG_FILE_NAME = "build-log.xml";
   private static final String LOG_FILE_NAME = "build.log";
   private static final String DEFAULT_LOGGER_CONFIG = "defaultLogConfig.xml";
@@ -65,19 +73,10 @@ public class BuildMain {
   private static final int SYSTEM_DIR_ARG = SESSION_ID_ARG + 1;
 
   private static NioEventLoopGroup ourEventLoopGroup;
+  @Nullable 
+  private static PreloadedData ourPreloadedData;
 
   public static void main(String[] args){
-    final long start = System.nanoTime();
-    Runtime.getRuntime().addShutdownHook(new Thread("TimeLogger"){
-      public void run() {
-        final long totalTime = (System.nanoTime() - start) / 1000000L;
-
-        final long millis = totalTime % 1000L ;
-        final long seconds = totalTime / 1000L;
-
-        LOG.info("Total build time " + seconds + " sec " + millis + " ms");
-      }
-    });
     System.out.println("Build process started. Classpath: " + System.getProperty("java.class.path"));
     final String host = args[HOST_ARG];
     final int port = Integer.parseInt(args[PORT_ARG]);
@@ -123,6 +122,60 @@ public class BuildMain {
     final ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port)).awaitUninterruptibly();
     final boolean success = future.isSuccess();
     if (success) {
+      final String projectPathToPreload = System.getProperty(PRELOAD_PROJECT_PATH, null);
+      final String globalsPathToPreload = System.getProperty(PRELOAD_CONFIG_PATH, null); 
+      if (projectPathToPreload != null && globalsPathToPreload != null) {
+        final long preloadStart = System.currentTimeMillis();
+        final PreloadedData data = new PreloadedData();
+        ourPreloadedData = data;
+        try {
+          FileSystemUtil.getAttributes(projectPathToPreload); // this will pre-load all FS optimizations
+
+          final BuildRunner runner = new BuildRunner(new JpsModelLoaderImpl(projectPathToPreload, globalsPathToPreload, null));
+          data.setRunner(runner);
+
+          final File dataStorageRoot = Utils.getDataStorageRoot(projectPathToPreload);
+          final BuildFSState fsState = new BuildFSState(false);
+          final ProjectDescriptor pd = runner.load(new MessageHandler() {
+            @Override
+            public void processMessage(BuildMessage msg) {
+              data.addMessage(msg);
+            }
+          }, dataStorageRoot, fsState);
+          data.setProjectDescriptor(pd);
+          
+          try {
+            final File fsStateFile = new File(dataStorageRoot, BuildSession.FS_STATE_FILE);
+            final DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(fsStateFile)));
+            try {
+              final int version = in.readInt();
+              if (version == FSState.VERSION) {
+                final long savedOrdinal = in.readLong();
+                in.readBoolean(); // must skip "has-work-to-do" flag
+                fsState.load(in, pd.getModel(), pd.getBuildRootIndex());
+                data.setFsEventOrdinal(savedOrdinal);
+              }
+            }
+            finally {
+              in.close();
+            }
+          }
+          catch (FileNotFoundException ignored) {
+          }
+          catch (IOException e) {
+            LOG.info("Error pre-loading FS state", e);
+            fsState.clearAll();
+          }
+          LOG.info("Pre-loaded project model in " + (System.currentTimeMillis() - preloadStart) + " ms");
+        }
+        catch (Throwable e) {
+          LOG.info("Failed to pre-load project " + projectPathToPreload, e);
+          // just failed to preload the project, the situation will be handled later, when real build starts
+        }
+      }
+      else if (projectPathToPreload != null || globalsPathToPreload != null){
+        LOG.info("Skipping project pre-loading step: both paths to project configuration files and path to global settings must be specified");
+      }
       future.channel().writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, CmdlineProtoUtil.createParamRequest()));
     }
     else {
@@ -159,7 +212,7 @@ public class BuildMain {
           case BUILD_PARAMETERS: {
             if (mySession == null) {
               final CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta = controllerMessage.hasFsEvent()? controllerMessage.getFsEvent() : null;
-              final BuildSession session = new BuildSession(mySessionId, channel, controllerMessage.getParamsMessage(), delta);
+              final BuildSession session = new BuildSession(mySessionId, channel, controllerMessage.getParamsMessage(), delta, ourPreloadedData);
               mySession = session;
               SharedThreadPool.getInstance().executeOnPooledThread(new Runnable() {
                 @Override
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
index a03c127af2c6..1b893a45a302 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
@@ -58,14 +58,20 @@ public class BuildRunner {
   public static final boolean PARALLEL_BUILD_ENABLED = Boolean.parseBoolean(System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false"));
   private static final boolean STORE_TEMP_CACHES_IN_MEMORY = PARALLEL_BUILD_ENABLED || Boolean.valueOf(System.getProperty(GlobalOptions.USE_MEMORY_TEMP_CACHE_OPTION, "true"));
   private final JpsModelLoader myModelLoader;
-  private final List<String> myFilePaths;
-  private final Map<String, String> myBuilderParams;
+  private List<String> myFilePaths = Collections.emptyList();
+  private Map<String, String> myBuilderParams = Collections.emptyMap();
   private boolean myForceCleanCaches;
 
-  public BuildRunner(JpsModelLoader modelLoader, List<String> filePaths, Map<String, String> builderParams) {
+  public BuildRunner(JpsModelLoader modelLoader) {
     myModelLoader = modelLoader;
-    myFilePaths = filePaths;
-    myBuilderParams = builderParams;
+  }
+
+  public void setFilePaths(List<String> filePaths) {
+    myFilePaths = filePaths != null? filePaths : Collections.<String>emptyList();
+  }
+
+  public void setBuilderParams(Map<String, String> builderParams) {
+    myBuilderParams = builderParams != null? builderParams : Collections.<String, String>emptyMap();
   }
 
   public ProjectDescriptor load(MessageHandler msgHandler, File dataStorageRoot, BuildFSState fsState) throws IOException {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 9dd87443eae0..0fc6039dfb90 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.concurrency.SequentialTaskExecutor;
 import com.intellij.util.io.DataOutputStream;
 import io.netty.channel.Channel;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.TimingLog;
 import org.jetbrains.jps.api.*;
@@ -57,9 +58,11 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage
 */
 final class BuildSession implements Runnable, CanceledStatus {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession");
-  private static final String FS_STATE_FILE = "fs_state.dat";
+  public static final String FS_STATE_FILE = "fs_state.dat";
   private final UUID mySessionId;
   private final Channel myChannel;
+  @Nullable 
+  private final PreloadedData myPreloadedData;
   private volatile boolean myCanceled = false;
   private final String myProjectPath;
   @Nullable
@@ -70,6 +73,7 @@ final class BuildSession implements Runnable, CanceledStatus {
   private volatile ProjectDescriptor myProjectDescriptor;
   private final Map<Pair<String, String>, ConstantSearchFuture> mySearchTasks = Collections.synchronizedMap(new HashMap<Pair<String, String>, ConstantSearchFuture>());
   private final ConstantSearch myConstantSearch = new ConstantSearch();
+  @NotNull
   private final BuildRunner myBuildRunner;
   private final boolean myForceModelLoading;
   private final BuildType myBuildType;
@@ -78,24 +82,31 @@ final class BuildSession implements Runnable, CanceledStatus {
   BuildSession(UUID sessionId,
                Channel channel,
                CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage params,
-               @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta) {
+               @Nullable CmdlineRemoteProto.Message.ControllerMessage.FSEvent delta, @Nullable PreloadedData preloaded) {
     mySessionId = sessionId;
     myChannel = channel;
-
+    myPreloadedData = preloaded;
+    
     final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals = params.getGlobalSettings();
     myProjectPath = FileUtil.toCanonicalPath(params.getProjectId());
     String globalOptionsPath = FileUtil.toCanonicalPath(globals.getGlobalOptionsPath());
     myBuildType = convertCompileType(params.getBuildType());
     myScopes = params.getScopeList();
     List<String> filePaths = params.getFilePathList();
-    Map<String, String> builderParams = new HashMap<String, String>();
+    final Map<String, String> builderParams = new HashMap<String, String>();
     for (CmdlineRemoteProto.Message.KeyValuePair pair : params.getBuilderParameterList()) {
       builderParams.put(pair.getKey(), pair.getValue());
     }
     myInitialFSDelta = delta;
-    JpsModelLoaderImpl loader = new JpsModelLoaderImpl(myProjectPath, globalOptionsPath, null);
-    myForceModelLoading = Boolean.parseBoolean(builderParams.get(BuildParametersKeys.FORCE_MODEL_LOADING));
-    myBuildRunner = new BuildRunner(loader, filePaths, builderParams);
+    if (preloaded == null || preloaded.getRunner() == null) {
+      myBuildRunner = new BuildRunner(new JpsModelLoaderImpl(myProjectPath, globalOptionsPath, null));
+    }
+    else {
+      myBuildRunner = preloaded.getRunner();
+    }
+    myBuildRunner.setFilePaths(filePaths);
+    myBuildRunner.setBuilderParams(builderParams);
+    myForceModelLoading = (preloaded != null && preloaded.getProjectDescriptor() != null) || Boolean.parseBoolean(builderParams.get(BuildParametersKeys.FORCE_MODEL_LOADING));
   }
 
   @Override
@@ -185,8 +196,9 @@ final class BuildSession implements Runnable, CanceledStatus {
       // invoked the very first time for this project
       myBuildRunner.setForceCleanCaches(true);
     }
-
-    final DataInputStream fsStateStream = createFSDataStream(dataStorageRoot);
+    final ProjectDescriptor preloadedProject = myPreloadedData != null? myPreloadedData.getProjectDescriptor() : null;
+    final DataInputStream fsStateStream = 
+      preloadedProject != null || myInitialFSDelta == null /*this will force FS rescan*/? null : createFSDataStream(dataStorageRoot, myInitialFSDelta.getOrdinal());
 
     if (fsStateStream != null) {
       // optimization: check whether we can skip the build
@@ -198,27 +210,56 @@ final class BuildSession implements Runnable, CanceledStatus {
       }
     }
 
-    final BuildFSState fsState = new BuildFSState(false);
+    final BuildFSState fsState = preloadedProject != null? preloadedProject.fsState : new BuildFSState(false);
     try {
-      final ProjectDescriptor pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
-      TimingLog.LOG.debug("Project descriptor loaded");
-      myProjectDescriptor = pd;
-      if (fsStateStream != null) {
-        try {
-          try {
-            fsState.load(fsStateStream, pd.getModel(), pd.getBuildRootIndex());
-            applyFSEvent(pd, myInitialFSDelta, false);
-            TimingLog.LOG.debug("FS Delta loaded");
-          }
-          finally {
-            fsStateStream.close();
+      final ProjectDescriptor pd;
+      if (preloadedProject != null) {
+        pd = preloadedProject;
+        final List<BuildMessage> preloadMessages = myPreloadedData.getLoadMessages();
+        if (!preloadMessages.isEmpty()) {
+          // replay preload-time messages, so that they are delivered to the IDE
+          for (BuildMessage message : preloadMessages) {
+            msgHandler.processMessage(message);
           }
         }
-        catch (Throwable e) {
-          LOG.error(e);
-          fsState.clearAll();
+        if (myInitialFSDelta == null || myPreloadedData.getFsEventOrdinal() + 1L != myInitialFSDelta.getOrdinal()) {
+          // FS rescan was forced
+          fsState.clearAll(); 
+        }
+        else {
+          // apply events to already loaded state
+          try {
+            applyFSEvent(pd, myInitialFSDelta, false);
+          }
+          catch (Throwable e) {
+            LOG.error(e);
+            fsState.clearAll();
+          }
         }
       }
+      else {
+        // standard case
+        pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
+        TimingLog.LOG.debug("Project descriptor loaded");
+        if (fsStateStream != null) {
+          try {
+            try {
+              fsState.load(fsStateStream, pd.getModel(), pd.getBuildRootIndex());
+              applyFSEvent(pd, myInitialFSDelta, false);
+              TimingLog.LOG.debug("FS Delta loaded");
+            }
+            finally {
+              fsStateStream.close();
+            }
+          }
+          catch (Throwable e) {
+            LOG.error(e);
+            fsState.clearAll();
+          }
+        }
+      }
+      myProjectDescriptor = pd;
+      
       myLastEventOrdinal = myInitialFSDelta != null? myInitialFSDelta.getOrdinal() : 0L;
 
       // free memory
@@ -469,11 +510,7 @@ final class BuildSession implements Runnable, CanceledStatus {
   }
 
   @Nullable
-  private DataInputStream createFSDataStream(File dataStorageRoot) {
-    if (myInitialFSDelta == null) {
-      // this will force FS rescan
-      return null;
-    }
+  private static DataInputStream createFSDataStream(File dataStorageRoot, final long currentEventOrdinal) {
     try {
       final File file = new File(dataStorageRoot, FS_STATE_FILE);
       byte[] bytes;
@@ -490,7 +527,7 @@ final class BuildSession implements Runnable, CanceledStatus {
         return null;
       }
       final long savedOrdinal = in.readLong();
-      if (savedOrdinal + 1L != myInitialFSDelta.getOrdinal()) {
+      if (savedOrdinal + 1L != currentEventOrdinal) {
         return null;
       }
       return in;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java
new file mode 100644
index 000000000000..bf5ece5d6fdd
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/PreloadedData.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jps.cmdline;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.incremental.messages.BuildMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Eugene Zhuravlev
+ *         Date: 22-Oct-14
+ */
+public class PreloadedData {
+  @Nullable 
+  private BuildRunner runner;
+  @Nullable
+  private ProjectDescriptor projectDescriptor;
+  
+  private final List<BuildMessage> loadMessages = new ArrayList<BuildMessage>();
+  
+  private long fsEventOrdinal;
+
+  @Nullable
+  public BuildRunner getRunner() {
+    return runner;
+  }
+
+  public void setRunner(@Nullable BuildRunner runner) {
+    this.runner = runner;
+  }
+
+  @Nullable
+  public ProjectDescriptor getProjectDescriptor() {
+    return projectDescriptor;
+  }
+
+  public void setProjectDescriptor(@Nullable ProjectDescriptor projectDescriptor) {
+    this.projectDescriptor = projectDescriptor;
+  }
+
+  public long getFsEventOrdinal() {
+    return fsEventOrdinal;
+  }
+
+  public void setFsEventOrdinal(long fsEventOrdinal) {
+    this.fsEventOrdinal = fsEventOrdinal;
+  }
+
+  public List<BuildMessage> getLoadMessages() {
+    return loadMessages;
+  }
+  
+  public void addMessage(BuildMessage msg) {
+    loadMessages.add(msg);
+  }
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
index ac4f4a0b78fc..751b74b459e2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
@@ -168,7 +168,16 @@ public class JavacMain {
       diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, e.getMessage()));
     }
     catch (CompilationCanceledException ignored) {
-      diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.OTHER, "Compilation was canceled"));
+      handleCancelException(diagnosticConsumer);
+    }
+    catch (RuntimeException e) {
+      final Throwable cause = e.getCause();
+      if (cause instanceof CompilationCanceledException) {
+        handleCancelException(diagnosticConsumer);
+      }
+      else {
+        throw e;
+      }
     }
     finally {
       fileManager.close();
@@ -179,6 +188,10 @@ public class JavacMain {
     return false;
   }
 
+  private static void handleCancelException(DiagnosticOutputConsumer diagnosticConsumer) {
+    diagnosticConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.OTHER, "Compilation was canceled"));
+  }
+
   private static List<JavaSourceTransformer> getSourceTransformers() {
     final Class<JavaSourceTransformer> transformerClass = JavaSourceTransformer.class;
     final ServiceLoader<JavaSourceTransformer> loader = ServiceLoader.load(transformerClass, transformerClass.getClassLoader());
diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
index 18ad56192055..cf8c0cba3667 100644
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.jps.model.serialization;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtilRt;
@@ -30,6 +31,8 @@ import java.io.IOException;
  * @author nik
  */
 public abstract class JpsLoaderBase {
+  private static final Logger LOG = Logger.getInstance(JpsLoaderBase.class);
+  private static final int MAX_ATTEMPTS = 5;
   private final JpsMacroExpander myMacroExpander;
 
   protected JpsLoaderBase(JpsMacroExpander macroExpander) {
@@ -66,7 +69,7 @@ public abstract class JpsLoaderBase {
 
   protected static Element loadRootElement(final File file, final JpsMacroExpander macroExpander) {
     try {
-      final Element element = JDOMUtil.loadDocument(file).getRootElement();
+      final Element element = tryLoadRootElement(file);
       macroExpander.substitute(element, SystemInfo.isFileSystemCaseSensitive);
       return element;
     }
@@ -78,6 +81,24 @@ public abstract class JpsLoaderBase {
     }
   }
 
+  private static Element tryLoadRootElement(File file) throws IOException, JDOMException {
+    for (int i = 0; i < MAX_ATTEMPTS - 1; i++) {
+      try {
+        return JDOMUtil.loadDocument(file).getRootElement();
+      }
+      catch (Exception e) {
+        LOG.info("Loading attempt #" + i + " failed", e);
+      }
+      //most likely configuration file is being written by IDE so we'll wait a little
+      try {
+        //noinspection BusyWait
+        Thread.sleep(300);
+      }
+      catch (InterruptedException ignored) { }
+    }
+    return JDOMUtil.loadDocument(file).getRootElement();
+  }
+
   protected static boolean isXmlFile(File file) {
     return file.isFile() && FileUtilRt.extensionEquals(file.getName(), "xml");
   }
diff --git a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
index 979fd78703f1..7b7d425f1a09 100644
--- a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
+++ b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
@@ -193,8 +193,7 @@ public class Standalone {
 
   public static void runBuild(JpsModelLoader loader, File dataStorageRoot, MessageHandler messageHandler, List<TargetTypeBuildScope> scopes,
                               boolean includeDependenciesToScope) throws Exception {
-    final BuildRunner buildRunner = new BuildRunner(loader, Collections.<String>emptyList(), Collections.<String, String>emptyMap()
-    );
+    final BuildRunner buildRunner = new BuildRunner(loader);
     ProjectDescriptor descriptor = buildRunner.load(messageHandler, dataStorageRoot, new BuildFSState(true));
     try {
       buildRunner.runBuild(descriptor, CanceledStatus.NULL, null, messageHandler, BuildType.BUILD, scopes, includeDependenciesToScope);
diff --git a/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java b/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
index 5f51296b37d9..6bb2ee9ee166 100644
--- a/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
+++ b/json/src/com/intellij/json/psi/impl/JsonTreeChangePreprocessor.java
@@ -1,6 +1,7 @@
 package com.intellij.json.psi.impl;
 
 import com.intellij.json.JsonLanguage;
+import com.intellij.json.psi.JsonFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileSystemItem;
@@ -20,6 +21,8 @@ public class JsonTreeChangePreprocessor implements PsiTreeChangePreprocessor {
    */
   @Override
   public void treeChanged(@NotNull PsiTreeChangeEventImpl event) {
+    if (!(event.getFile() instanceof JsonFile)) return;
+
     final PsiElement element = event.getParent();
     if (element == null || !(element.getManager() instanceof PsiManagerImpl)) {
       return;
diff --git a/json/tests/test/com/intellij/json/JsonStructureViewTest.java b/json/tests/test/com/intellij/json/JsonStructureViewTest.java
index aa5e43cf89c5..24d563e6ef77 100644
--- a/json/tests/test/com/intellij/json/JsonStructureViewTest.java
+++ b/json/tests/test/com/intellij/json/JsonStructureViewTest.java
@@ -66,7 +66,9 @@ public class JsonStructureViewTest extends JsonTestCase {
            "  -object\n" +
            "   nestedObject\n" +
            " -array\n" +
-           "  +array\n" +
+           "  -array\n" +
+           "   -object\n" +
+           "    deepNestedObject\n" +
            " -object\n" +
            "  siblingObject\n");
   }
diff --git a/lib/proxy-vole_20120920.jar b/lib/proxy-vole_20131209.jar
similarity index 59%
rename from lib/proxy-vole_20120920.jar
rename to lib/proxy-vole_20131209.jar
index 29db3d34eec3..70927e4f6c96 100644
Binary files a/lib/proxy-vole_20120920.jar and b/lib/proxy-vole_20131209.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 997eb52a6fc6..a989728f72e1 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -52,7 +52,7 @@ netty-all-4.1.0.Beta3.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar
-proxy-vole_20120920.jar
+proxy-vole_20131209.jar
 pty4j-0.3.jar
 purejavacomm.jar
 resolver.jar
diff --git a/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
new file mode 100644
index 000000000000..dabb6ac530ea
--- /dev/null
+++ b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class WelcomeWizardUtil {
+  private static volatile String ourDefaultLAF;
+  private static volatile String ourWizardLAF;
+  private static volatile String ourWizardMacKeymap;
+  private static volatile String ourWizardEditorScheme;
+  private static volatile Boolean ourAutoScrollToSource;
+  private static volatile Set<String> ourFeaturedPluginsToInstall = new HashSet<String>();
+
+  public static void setDefaultLAF(String laf) {
+    ourDefaultLAF = laf;
+  }
+
+  public static String getDefaultLAF() {
+    return ourDefaultLAF;
+  }
+
+  public static void setWizardLAF(String laf) {
+    ourWizardLAF = laf;
+  }
+
+  public static String getWizardLAF() {
+    return ourWizardLAF;
+  }
+
+  public static void setWizardKeymap(@Nullable String keymap) {
+    ourWizardMacKeymap = keymap;
+  }
+
+  @Nullable
+  public static String getWizardMacKeymap() {
+    return ourWizardMacKeymap;
+  }
+
+  public static void setWizardEditorScheme(@Nullable String wizardEditorScheme) {
+    ourWizardEditorScheme = wizardEditorScheme;
+  }
+
+  @Nullable
+  public static String getWizardEditorScheme() {
+    return ourWizardEditorScheme;
+  }
+
+  @Nullable
+  public static Boolean getAutoScrollToSource() {
+    return ourAutoScrollToSource;
+  }
+
+  public static void setAutoScrollToSource(@Nullable Boolean autoScrollToSource) {
+    ourAutoScrollToSource = autoScrollToSource;
+  }
+
+  public static Set<String> getFeaturedPluginsToInstall() {
+    return Collections.unmodifiableSet(ourFeaturedPluginsToInstall);
+  }
+
+  public static void setFeaturedPluginsToInstall(Set<String> pluginsToInstall) {
+    ourFeaturedPluginsToInstall.clear();
+    ourFeaturedPluginsToInstall.addAll(pluginsToInstall);
+  }
+}
diff --git a/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java b/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
index b393f8d37707..2df20519e18d 100644
--- a/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/FCTSBackedLighterAST.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-class FCTSBackedLighterAST extends LighterAST {
+public class FCTSBackedLighterAST extends LighterAST {
   private final FlyweightCapableTreeStructure<LighterASTNode> myTreeStructure;
 
   public FCTSBackedLighterAST(final CharTable charTable, final FlyweightCapableTreeStructure<LighterASTNode> treeStructure) {
diff --git a/platform/core-api/src/com/intellij/lang/FileASTNode.java b/platform/core-api/src/com/intellij/lang/FileASTNode.java
index 136530822a23..193e2421ebd1 100644
--- a/platform/core-api/src/com/intellij/lang/FileASTNode.java
+++ b/platform/core-api/src/com/intellij/lang/FileASTNode.java
@@ -17,6 +17,7 @@ package com.intellij.lang;
 
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Top-level node in AST, corresponds to PsiFile.
@@ -28,4 +29,7 @@ public interface FileASTNode extends ASTNode {
   CharTable getCharTable();
 
   boolean isParsed();
+
+  @Nullable
+  LighterAST getLighterAST();
 }
diff --git a/platform/core-api/src/com/intellij/lang/LighterAST.java b/platform/core-api/src/com/intellij/lang/LighterAST.java
index 71305c5937be..de2c44aa1299 100644
--- a/platform/core-api/src/com/intellij/lang/LighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/LighterAST.java
@@ -15,8 +15,6 @@
  */
 package com.intellij.lang;
 
-import com.intellij.psi.tree.IFileElementType;
-import com.intellij.psi.tree.ILightStubFileElementType;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,19 +44,4 @@ public abstract class LighterAST {
 
   @NotNull
   public abstract List<LighterASTNode> getChildren(@NotNull final LighterASTNode parent);
-
-  public static @Nullable LighterAST getLighterASTFromFileAST(@NotNull FileASTNode node, @NotNull Language language) {
-    final IFileElementType contentType = LanguageParserDefinitions.INSTANCE.forLanguage(language).getFileNodeType();
-    assert contentType instanceof ILightStubFileElementType;
-
-    final LighterAST tree;
-    if (!node.isParsed()) {
-      final ILightStubFileElementType<?> type = (ILightStubFileElementType)contentType;
-      tree = new FCTSBackedLighterAST(node.getCharTable(), type.parseContentsLight(node));
-    }
-    else {
-      tree = new TreeBackedLighterAST(node);
-    }
-    return tree;
-  }
 }
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
index 102288e1a9a0..e9dec24fca2c 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
@@ -47,7 +47,7 @@ public class LightStubBuilder implements StubBuilder {
       LOG.error("File is not of ILightStubFileElementType: " + contentType + ", " + file);
       return null;
     }
-    final LighterAST tree = LighterAST.getLighterASTFromFileAST(file.getNode(), language);
+    final LighterAST tree = file.getNode().getLighterAST();
     if (tree == null) return null;
 
     final StubElement rootStub = createStubForFile(file, tree);
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index d80d36822eb1..c4681c4d77e9 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -30,7 +30,10 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.util.io.ZipFileCache;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.*;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.Function;
+import com.intellij.util.PlatformUtilsCore;
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.execution.ParametersListUtil;
@@ -166,7 +169,7 @@ public class PluginManagerCore {
     return app != null && app.isUnitTestMode();
   }
 
-  public static void savePluginsList(Collection<String> ids, boolean append, File plugins) throws IOException {
+  public static void savePluginsList(@NotNull Collection<String> ids, boolean append, @NotNull File plugins) throws IOException {
     if (!plugins.isFile()) {
       FileUtil.ensureCanCreateFile(plugins);
     }
@@ -700,7 +703,13 @@ public class PluginManagerCore {
                                      List<IdeaPluginDescriptorImpl> result,
                                      @Nullable StartupProgress progress,
                                      int pluginsCount) {
-    final File pluginsHome = new File(pluginsPath);
+    loadDescriptors(new File(pluginsPath), result, progress, pluginsCount);
+  }
+
+  public static void loadDescriptors(@NotNull File pluginsHome,
+                                     List<IdeaPluginDescriptorImpl> result,
+                                     @Nullable StartupProgress progress,
+                                     int pluginsCount) {
     final File[] files = pluginsHome.listFiles();
     if (files != null) {
       int i = result.size();
diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index e03244e0e0e9..0bc853c76815 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -89,6 +89,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
   private final ASTNode myOriginalTree;
   private final MyTreeStructure myParentLightTree;
+  private final int myOffset;
 
   private static TokenSet ourAnyLanguageWhitespaceTokens = TokenSet.EMPTY;
 
@@ -132,7 +133,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @Nullable ASTNode originalTree,
                         @Nullable MyTreeStructure parentLightTree) {
     this(project, containingFile, parserDefinition.getWhitespaceTokens(), parserDefinition.getCommentTokens(), lexer, charTable, text,
-         originalTree, parentLightTree);
+         originalTree, parentLightTree, 0);
   }
 
   public PsiBuilderImpl(Project project,
@@ -144,6 +145,19 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @NotNull final CharSequence text,
                         @Nullable ASTNode originalTree,
                         @Nullable MyTreeStructure parentLightTree) {
+    this(project, containingFile, whiteSpaces, comments, lexer, charTable, text, originalTree, parentLightTree, 0);
+  }
+
+  private PsiBuilderImpl(Project project,
+                        PsiFile containingFile,
+                        @NotNull TokenSet whiteSpaces,
+                        @NotNull TokenSet comments,
+                        @NotNull Lexer lexer,
+                        CharTable charTable,
+                        @NotNull final CharSequence text,
+                        @Nullable ASTNode originalTree,
+                        @Nullable MyTreeStructure parentLightTree,
+                        int offset) {
     myProject = project;
     myFile = containingFile;
 
@@ -156,6 +170,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
     myCharTable = charTable;
     myOriginalTree = originalTree;
     myParentLightTree = parentLightTree;
+    myOffset = offset;
 
     cacheLexemes();
   }
@@ -174,8 +189,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
                         @NotNull final Lexer lexer,
                         @NotNull final LighterLazyParseableNode chameleon,
                         @NotNull final CharSequence text) {
-    this(project, chameleon.getContainingFile(), parserDefinition, lexer, chameleon.getCharTable(), text,
-         null, ((LazyParseableToken)chameleon).myParent);
+    this(project, chameleon.getContainingFile(), parserDefinition.getWhitespaceTokens(), parserDefinition.getCommentTokens(), lexer,
+         chameleon.getCharTable(), text, null, ((LazyParseableToken)chameleon).myParent, chameleon.getStartOffset());
   }
 
   private void cacheLexemes() {
@@ -335,12 +350,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getStartOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
     public int getEndOffset() {
-      return myBuilder.myLexStarts[myDoneMarker.myLexemeIndex];
+      return myBuilder.myLexStarts[myDoneMarker.myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
@@ -487,12 +502,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getEndOffset() {
-      return myTokenEnd;
+      return myTokenEnd + myBuilder.myOffset;
     }
 
     @Override
     public int getStartOffset() {
-      return myTokenStart;
+      return myTokenStart + myBuilder.myOffset;
     }
 
     public CharSequence getText() {
@@ -636,12 +651,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
     @Override
     public int getEndOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
     public int getStartOffset() {
-      return myBuilder.myLexStarts[myLexemeIndex];
+      return myBuilder.myLexStarts[myLexemeIndex] + myBuilder.myOffset;
     }
 
     @Override
@@ -1474,6 +1489,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
     private final LimitedPool<Token> myPool;
     private final LimitedPool<LazyParseableToken> myLazyPool;
     private final StartMarker myRoot;
+    private final int myOffset;
 
     public MyTreeStructure(@NotNull StartMarker root, @Nullable final MyTreeStructure parentTree) {
       if (parentTree == null) {
@@ -1499,10 +1515,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
             return new LazyParseableToken();
           }
         });
+        myOffset = 0;
       }
       else {
         myPool = parentTree.myPool;
         myLazyPool = parentTree.myLazyPool;
+        myOffset = parentTree.getRoot().getStartOffset();
       }
       myRoot = root;
     }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
index d3071ddbca7d..a2348eabbe97 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/FileElement.java
@@ -16,16 +16,19 @@
 
 package com.intellij.psi.impl.source.tree;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.FileASTNode;
+import com.intellij.lang.*;
 import com.intellij.openapi.util.Getter;
+import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.source.CharTableImpl;
 import com.intellij.psi.impl.source.PsiFileImpl;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.IFileElementType;
+import com.intellij.psi.tree.ILightStubFileElementType;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class FileElement extends LazyParseableElement implements FileASTNode, Getter<FileElement> {
   private volatile CharTable myCharTable = new CharTableImpl();
@@ -47,6 +50,35 @@ public class FileElement extends LazyParseableElement implements FileASTNode, Ge
     return myCharTable;
   }
 
+  private static final Key<LighterAST> ourTreeKey = Key.create("lighter.key");
+
+  @Nullable
+  @Override
+  public LighterAST getLighterAST() {
+    final IFileElementType contentType = (IFileElementType)getElementType();
+    assert contentType instanceof ILightStubFileElementType;
+
+    LighterAST tree;
+    if (!isParsed()) {
+      tree = getUserData(ourTreeKey);
+      if (tree == null) {
+        final ILightStubFileElementType<?> type = (ILightStubFileElementType)contentType;
+        tree = new FCTSBackedLighterAST(getCharTable(), type.parseContentsLight(this));
+        putUserData(ourTreeKey, tree);
+      }
+    }
+    else {
+      tree = new TreeBackedLighterAST(this);
+    }
+    return tree;
+  }
+
+  @Override
+  protected void resetCachesOnParsedStateUpdate() {
+    putUserData(ourTreeKey, null);
+    super.resetCachesOnParsedStateUpdate();
+  }
+
   public FileElement(IElementType type, CharSequence text) {
     super(type, text);
   }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
index ebc699aaf181..85a28f195282 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
@@ -181,8 +181,8 @@ public class LazyParseableElement extends CompositeElement {
         if (rawFirstChild() != null) {
           LOG.error("Reentrant parsing?");
         }
-  
-        myText = null;
+
+        resetCachesOnParsedStateUpdate();
   
         if (parsedNode == null) return;
         super.rawAddChildrenWithoutNotifications((TreeElement)parsedNode);
@@ -199,6 +199,10 @@ public class LazyParseableElement extends CompositeElement {
     }
   }
 
+  protected void resetCachesOnParsedStateUpdate() {
+    myText = null;
+  }
+
   @Override
   public void rawAddChildrenWithoutNotifications(@NotNull TreeElement first) {
     if (myText() != null) {
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
new file mode 100644
index 000000000000..c3011c11454e
--- /dev/null
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/LightDuplicateProfile.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.dupLocator;
+
+import com.intellij.lang.LighterAST;
+import com.intellij.lang.LighterASTNode;
+import com.intellij.psi.PsiFile;
+
+/**
+ * Created by Maxim.Mossienko on 10/1/2014.
+ */
+public interface LightDuplicateProfile {
+  void process(PsiFile file, Callback callback);
+
+  interface Callback {
+    void process(LighterAST ast, LighterASTNode node, int hash);
+  }
+}
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
index 55367ae4a19d..cf4249cecd65 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
@@ -18,15 +18,18 @@ package com.intellij.dupLocator.index;
 import com.intellij.dupLocator.DuplicatesProfile;
 import com.intellij.dupLocator.DuplocateVisitor;
 import com.intellij.dupLocator.DuplocatorState;
+import com.intellij.dupLocator.LightDuplicateProfile;
 import com.intellij.dupLocator.treeHash.FragmentsCollector;
 import com.intellij.dupLocator.util.PsiFragment;
 import com.intellij.lang.Language;
+import com.intellij.lang.LighterAST;
+import com.intellij.lang.LighterASTNode;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.DataExternalizer;
@@ -52,6 +55,7 @@ import java.util.Map;
 public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayList> implements PsiDependentIndex {
   static boolean ourEnabled = SystemProperties.getBooleanProperty("idea.enable.duplicates.online.calculation",
                                                                   isEnabledByDefault());
+  static boolean ourEnabledLightProfiles = true;
 
   private static boolean isEnabledByDefault() {
     Application application = ApplicationManager.getApplication();
@@ -59,7 +63,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
   }
 
   @NonNls public static final ID<Integer, TIntArrayList> NAME = ID.create("DuplicatesIndex");
-  private static final int myBaseVersion = 10;
+  private static final int myBaseVersion = 12;
 
   private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() {
     @Override
@@ -107,21 +111,31 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
     @Override
     @NotNull
     public Map<Integer, TIntArrayList> map(@NotNull final FileContent inputData) {
-      return ApplicationManager.getApplication().runReadAction(new Computable<Map<Integer, TIntArrayList>>() {
-        @Override
-        public Map<Integer, TIntArrayList> compute() {
-          FileType type = inputData.getFileType();
+      FileType type = inputData.getFileType();
 
-          DuplicatesProfile profile = findDuplicatesProfile(type);
-          if (profile == null) return Collections.emptyMap();
+      DuplicatesProfile profile = findDuplicatesProfile(type);
+      if (profile == null) return Collections.emptyMap();
 
-          MyFragmentsCollector collector = new MyFragmentsCollector(profile, ((LanguageFileType)type).getLanguage());
-          DuplocateVisitor visitor = profile.createVisitor(collector, true);
-          visitor.visitNode(((FileContentImpl)inputData).getPsiFileAccountingForUnsavedDocument());
+      PsiFile psiFile = ((FileContentImpl)inputData).getPsiFileAccountingForUnsavedDocument();
 
-          return collector.getMap();
-        }
-      });
+      if (profile instanceof LightDuplicateProfile && ourEnabledLightProfiles) {
+        final THashMap<Integer, TIntArrayList> result = new THashMap<Integer, TIntArrayList>();
+        ((LightDuplicateProfile)profile).process(psiFile, new LightDuplicateProfile.Callback() {
+          @Override
+          public void process(LighterAST ast, LighterASTNode node, int hash) {
+            TIntArrayList list = result.get(hash);
+            if (list == null) { result.put(hash, list = new TIntArrayList(1)); }
+            list.add(node.getStartOffset());
+          }
+        });
+        return result;
+      }
+      MyFragmentsCollector collector = new MyFragmentsCollector(profile, ((LanguageFileType)type).getLanguage());
+      DuplocateVisitor visitor = profile.createVisitor(collector, true);
+
+      visitor.visitNode(psiFile);
+
+      return collector.getMap();
     }
   };
 
@@ -135,7 +149,7 @@ public class DuplicatesIndex extends FileBasedIndexExtension<Integer, TIntArrayL
 
   @Override
   public int getVersion() {
-    return myBaseVersion + (ourEnabled ? 0xFF : 0);
+    return myBaseVersion + (ourEnabled ? 0xFF : 0) + (ourEnabledLightProfiles ? 0x7F : 0);
   }
 
   @Override
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
index f015fe21213b..f44a3e2953c7 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesInspectionBase.java
@@ -3,10 +3,16 @@ package com.intellij.dupLocator.index;
 import com.intellij.codeInspection.*;
 import com.intellij.dupLocator.DuplicatesProfile;
 import com.intellij.dupLocator.DuplocatorState;
+import com.intellij.dupLocator.LightDuplicateProfile;
 import com.intellij.dupLocator.treeHash.FragmentsCollector;
 import com.intellij.dupLocator.util.PsiFragment;
+import com.intellij.lang.LighterAST;
+import com.intellij.lang.LighterASTNode;
+import com.intellij.lang.TreeBackedLighterAST;
 import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileWithId;
@@ -35,94 +41,126 @@ public class DuplicatesInspectionBase extends LocalInspectionTool {
     final DuplicatesProfile profile = DuplicatesIndex.findDuplicatesProfile(psiFile.getFileType());
     if (profile == null) return ProblemDescriptor.EMPTY_ARRAY;
 
-    final DuplocatorState state = profile.getDuplocatorState(psiFile.getLanguage());
-    final SmartList<ProblemDescriptor> descriptors = new SmartList<ProblemDescriptor>();
+    final Ref<DuplicatedCodeProcessor> myProcessorRef = new Ref<DuplicatedCodeProcessor>();
 
-    final TreeMap<Integer, TextRange> reportedRanges = new TreeMap<Integer, TextRange>();
-    final TIntObjectHashMap<VirtualFile> reportedFiles = new TIntObjectHashMap<VirtualFile>();
-    final TIntObjectHashMap<PsiElement> reportedPsi = new TIntObjectHashMap<PsiElement>();
-    final TIntIntHashMap reportedOffsetInOtherFiles = new TIntIntHashMap();
-    final TIntIntHashMap fragmentSize = new TIntIntHashMap();
+    if (profile instanceof LightDuplicateProfile && DuplicatesIndex.ourEnabledLightProfiles) {
 
-    profile.createVisitor(new FragmentsCollector() {
-      @Override
-      public void add(int hash, final int cost, @Nullable final PsiFragment frag) {
-        if (!DuplicatesIndex.isIndexedFragment(frag, cost, profile, state)) {
-          return;
+      ((LightDuplicateProfile)profile).process(psiFile, new LightDuplicateProfile.Callback() {
+        DuplicatedCodeProcessor<LighterASTNode> myProcessor;
+        @Override
+        public void process(final LighterAST ast, final LighterASTNode node, int hash) {
+          class LightDuplicatedCodeProcessor extends DuplicatedCodeProcessor<LighterASTNode> {
+
+            LightDuplicatedCodeProcessor(VirtualFile file, Project project) {
+              super(file, project);
+            }
+
+            @Override
+            protected TextRange getRangeInElement(LighterASTNode node) {
+              return null;
+            }
+
+            @Override
+            protected PsiElement getPsi(LighterASTNode node) {
+              return ((TreeBackedLighterAST)ast).unwrap(node).getPsi();
+            }
+
+            @Override
+            protected int getStartOffset(LighterASTNode node) {
+              return node.getStartOffset();
+            }
+
+            @Override
+            protected int getEndOffset(LighterASTNode node) {
+              return node.getEndOffset();
+            }
+          }
+          if (myProcessor == null) {
+            myProcessor = new LightDuplicatedCodeProcessor(virtualFile, psiFile.getProject());
+            myProcessorRef.set(myProcessor);
+          }
+          myProcessor.process(hash, node);
         }
+      });
+    } else {
+      final DuplocatorState state = profile.getDuplocatorState(psiFile.getLanguage());
+      profile.createVisitor(new FragmentsCollector() {
+        DuplicatedCodeProcessor<PsiFragment> myProcessor;
+        @Override
+        public void add(int hash, final int cost, @Nullable final PsiFragment frag) {
+          if (!DuplicatesIndex.isIndexedFragment(frag, cost, profile, state)) {
+            return;
+          }
 
-        ProgressManager.checkCanceled();
-        FileBasedIndex.getInstance().processValues(DuplicatesIndex.NAME, hash, null, new FileBasedIndex.ValueProcessor<TIntArrayList>() {
-          final ProjectFileIndex myProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(psiFile.getProject());
-          @Override
-          public boolean process(final VirtualFile file, final TIntArrayList list) {
-            for(int i = 0, len = list.size(); i < len; ++i) {
-              ProgressManager.checkCanceled();
+          class OldDuplicatedCodeProcessor extends DuplicatedCodeProcessor<PsiFragment> {
 
-              int value = list.getQuick(i);
+            OldDuplicatedCodeProcessor(VirtualFile file, Project project) {
+              super(file, project);
+            }
 
-              if (myProjectFileIndex.isInSource(virtualFile) && !myProjectFileIndex.isInSource(file)) return true;
-              if (!myProjectFileIndex.isInSource(virtualFile) && myProjectFileIndex.isInSource(file)) return true;
-              final int startOffset = frag.getStartOffset();
-              final int endOffset = frag.getEndOffset();
-              if (file.equals(virtualFile) && value >= startOffset && value < endOffset) continue;
-
-              PsiElement[] elements = frag.getElements();
-              PsiElement target = elements[0];
+            @Override
+            protected TextRange getRangeInElement(PsiFragment node) {
+              PsiElement[] elements = node.getElements();
               TextRange rangeInElement = null;
               if (elements.length > 1) {
-                PsiElement firstElement = elements[0];
-                target = firstElement.getParent();
+
                 PsiElement lastElement = elements[elements.length - 1];
                 rangeInElement = new TextRange(
                   elements[0].getStartOffsetInParent(),
                   lastElement.getStartOffsetInParent() + lastElement.getTextLength()
                 );
               }
+              return rangeInElement;
+            }
 
-              Integer fragmentStartOffsetInteger = startOffset;
-              SortedMap<Integer,TextRange> map = reportedRanges.subMap(fragmentStartOffsetInteger, endOffset);
-              int newFragmentSize = !map.isEmpty() ? 0:1;
+            @Override
+            protected PsiElement getPsi(PsiFragment node) {
+              PsiElement[] elements = node.getElements();
 
-              Iterator<Integer> iterator = map.keySet().iterator();
-              while(iterator.hasNext()) {
-                Integer next = iterator.next();
-                iterator.remove();
-                reportedFiles.remove(next);
-                reportedOffsetInOtherFiles.remove(next);
-                reportedPsi.remove(next);
-                newFragmentSize += fragmentSize.remove(next);
-              }
+              return elements.length > 1 ? elements[0].getParent() : elements[0];
+            }
 
-              reportedRanges.put(fragmentStartOffsetInteger, rangeInElement);
-              reportedFiles.put(fragmentStartOffsetInteger, file);
-              reportedOffsetInOtherFiles.put(fragmentStartOffsetInteger, value);
-              reportedPsi.put(fragmentStartOffsetInteger, target);
-              fragmentSize.put(fragmentStartOffsetInteger, newFragmentSize);
+            @Override
+            protected int getStartOffset(PsiFragment node) {
+              return node.getStartOffset();
+            }
 
-              return false;
+            @Override
+            protected int getEndOffset(PsiFragment node) {
+              return node.getEndOffset();
             }
-            return true;
           }
-        }, GlobalSearchScope.projectScope(psiFile.getProject()));
+          if (myProcessor == null) {
+            myProcessor = new OldDuplicatedCodeProcessor(virtualFile, psiFile.getProject());
+            myProcessorRef.set(myProcessor);
+          }
+          myProcessor.process(hash, frag);
+        }
+      }, true).visitNode(psiFile);
+    }
+
+    DuplicatedCodeProcessor<?> processor = myProcessorRef.get();
+
+    final SmartList<ProblemDescriptor> descriptors = new SmartList<ProblemDescriptor>();
+
+    if (processor != null) {
+
+      for(Map.Entry<Integer, TextRange> entry:processor.reportedRanges.entrySet()) {
+        final Integer offset = entry.getKey();
+        // todo 3 statements constant
+        if (processor.fragmentSize.get(offset) < 3) continue;
+        final VirtualFile file = processor.reportedFiles.get(offset);
+        String message = "Found duplicated code in " + file.getPath();
+
+        PsiElement targetElement = processor.reportedPsi.get(offset);
+        TextRange rangeInElement = entry.getValue();
+        final int offsetInOtherFile = processor.reportedOffsetInOtherFiles.get(offset);
+
+        LocalQuickFix fix = createNavigateToDupeFix(file, offsetInOtherFile);
+        ProblemDescriptor descriptor = manager
+          .createProblemDescriptor(targetElement, rangeInElement, message, ProblemHighlightType.WEAK_WARNING, isOnTheFly, fix);
+        descriptors.add(descriptor);
       }
-    }, true).visitNode(psiFile);
-
-    for(Map.Entry<Integer, TextRange> entry:reportedRanges.entrySet()) {
-      final Integer offset = entry.getKey();
-      // todo 3 statements constant
-      if (fragmentSize.get(offset) < 3) continue;
-      final VirtualFile file = reportedFiles.get(offset);
-      String message = "Found duplicated code in " + file.getPath();
-
-      PsiElement targetElement = reportedPsi.get(offset);
-      TextRange rangeInElement = entry.getValue();
-      final int offsetInOtherFile = reportedOffsetInOtherFiles.get(offset);
-
-      LocalQuickFix fix = createNavigateToDupeFix(file, offsetInOtherFile);
-      ProblemDescriptor descriptor = manager
-        .createProblemDescriptor(targetElement, rangeInElement, message, ProblemHighlightType.WEAK_WARNING, isOnTheFly, fix);
-      descriptors.add(descriptor);
     }
 
     return descriptors.isEmpty() ? null : descriptors.toArray(new ProblemDescriptor[descriptors.size()]);
@@ -131,4 +169,75 @@ public class DuplicatesInspectionBase extends LocalInspectionTool {
   protected LocalQuickFix createNavigateToDupeFix(@NotNull VirtualFile file, int offsetInOtherFile) {
     return null;
   }
+
+  static abstract class DuplicatedCodeProcessor<T> implements FileBasedIndex.ValueProcessor<TIntArrayList> {
+    final TreeMap<Integer, TextRange> reportedRanges = new TreeMap<Integer, TextRange>();
+    final TIntObjectHashMap<VirtualFile> reportedFiles = new TIntObjectHashMap<VirtualFile>();
+    final TIntObjectHashMap<PsiElement> reportedPsi = new TIntObjectHashMap<PsiElement>();
+    final TIntIntHashMap reportedOffsetInOtherFiles = new TIntIntHashMap();
+    final TIntIntHashMap fragmentSize = new TIntIntHashMap();
+    final VirtualFile virtualFile;
+    final Project project;
+    final ProjectFileIndex myProjectFileIndex;
+    T myNode;
+
+    DuplicatedCodeProcessor(VirtualFile file, Project project) {
+      virtualFile = file;
+      this.project = project;
+      myProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(project);
+    }
+
+    void process(int hash, T node) {
+      ProgressManager.checkCanceled();
+      myNode = node;
+      FileBasedIndex.getInstance().processValues(DuplicatesIndex.NAME, hash, null, this, GlobalSearchScope.projectScope(project));
+    }
+
+    @Override
+    public boolean process(VirtualFile file, TIntArrayList list) {
+      for(int i = 0, len = list.size(); i < len; ++i) {
+        ProgressManager.checkCanceled();
+
+        int value = list.getQuick(i);
+
+        if (myProjectFileIndex.isInSource(virtualFile) && !myProjectFileIndex.isInSource(file)) return true;
+        if (!myProjectFileIndex.isInSource(virtualFile) && myProjectFileIndex.isInSource(file)) return true;
+        final int startOffset = getStartOffset(myNode);
+        final int endOffset = getEndOffset(myNode);
+        if (file.equals(virtualFile) && value >= startOffset && value < endOffset) continue;
+
+        PsiElement target = getPsi(myNode);
+        TextRange rangeInElement = getRangeInElement(myNode);
+
+        Integer fragmentStartOffsetInteger = startOffset;
+        SortedMap<Integer,TextRange> map = reportedRanges.subMap(fragmentStartOffsetInteger, endOffset);
+        int newFragmentSize = !map.isEmpty() ? 0:1;
+
+        Iterator<Integer> iterator = map.keySet().iterator();
+        while(iterator.hasNext()) {
+          Integer next = iterator.next();
+          iterator.remove();
+          reportedFiles.remove(next);
+          reportedOffsetInOtherFiles.remove(next);
+          reportedPsi.remove(next);
+          newFragmentSize += fragmentSize.remove(next);
+        }
+
+        reportedRanges.put(fragmentStartOffsetInteger, rangeInElement);
+        reportedFiles.put(fragmentStartOffsetInteger, file);
+        reportedOffsetInOtherFiles.put(fragmentStartOffsetInteger, value);
+        reportedPsi.put(fragmentStartOffsetInteger, target);
+        fragmentSize.put(fragmentStartOffsetInteger, newFragmentSize);
+
+        return false;
+      }
+      return true;
+    }
+
+    protected abstract TextRange getRangeInElement(T node);
+    protected abstract PsiElement getPsi(T node);
+
+    protected abstract int getStartOffset(T node);
+    protected abstract int getEndOffset(T node);
+  }
 }
diff --git a/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java b/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java
new file mode 100644
index 000000000000..e1250c3dfeb4
--- /dev/null
+++ b/platform/dvcs-api/src/com/intellij/dvcs/push/PushSettings.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.dvcs.push;
+
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.components.StoragePathMacros;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.xmlb.annotations.AbstractCollection;
+import com.intellij.util.xmlb.annotations.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+@State(name = "Push.Settings", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
+public class PushSettings implements PersistentStateComponent<PushSettings.State> {
+
+  private State myState = new State();
+
+  public static class State {
+    @Tag("excluded-roots")
+    @AbstractCollection(surroundWithTag = false, elementTag = "path")
+    public Set<String> EXCLUDED_ROOTS = ContainerUtil.newHashSet();
+  }
+
+  @Nullable
+  @Override
+  public State getState() {
+    return myState;
+  }
+
+  @Override
+  public void loadState(State state) {
+    myState = state;
+  }
+
+  @NotNull
+  public Set<String> getExcludedRepoRoots() {
+    return myState.EXCLUDED_ROOTS;
+  }
+
+  public void saveExcludedRepoRoots(@NotNull Set<String> roots) {
+    myState.EXCLUDED_ROOTS = roots;
+  }
+}
+
diff --git a/platform/dvcs-impl/src/META-INF/dvcs.xml b/platform/dvcs-impl/src/META-INF/dvcs.xml
index aa81616f24f6..dc8a45b5f9b1 100644
--- a/platform/dvcs-impl/src/META-INF/dvcs.xml
+++ b/platform/dvcs-impl/src/META-INF/dvcs.xml
@@ -8,5 +8,8 @@
       <!--<keyboard-shortcut first-keystroke="control shift K" keymap="$default"/>-->
     <!--</action>-->
   </actions>
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceImplementation="com.intellij.dvcs.push.PushSettings"/>
+  </extensions>
 </idea-plugin>
 
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
index 5de06ffd7969..e4a8c1a64826 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
@@ -18,8 +18,8 @@ package com.intellij.dvcs.push;
 import com.intellij.dvcs.DvcsUtil;
 import com.intellij.dvcs.push.ui.*;
 import com.intellij.dvcs.repo.Repository;
-import com.intellij.dvcs.repo.RepositoryManager;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
@@ -53,6 +53,8 @@ public class PushController implements Disposable {
   @NotNull private final List<PushSupport<?, ?, ?>> myPushSupports;
   @NotNull private final PushLog myPushLog;
   @NotNull private final VcsPushDialog myDialog;
+  @NotNull private final PushSettings myExcludedSettings;
+  @NotNull private final Set<String> myExcludedRepositoryRoots;
   private boolean mySingleRepoProject;
   private static final int DEFAULT_CHILDREN_PRESENTATION_NUMBER = 20;
   private final ExecutorService myExecutorService = Executors.newSingleThreadExecutor();
@@ -64,6 +66,8 @@ public class PushController implements Disposable {
                         @NotNull VcsPushDialog dialog,
                         @NotNull List<? extends Repository> preselectedRepositories) {
     myProject = project;
+    myExcludedSettings = ServiceManager.getService(project, PushSettings.class);
+    myExcludedRepositoryRoots = ContainerUtil.newHashSet(myExcludedSettings.getExcludedRepoRoots());
     myPreselectedRepositories = preselectedRepositories;
     myPushSupports = getAffectedSupports(myProject);
     mySingleRepoProject = isSingleRepoProject(myPushSupports);
@@ -125,7 +129,8 @@ public class PushController implements Disposable {
     Map<RepositoryNode, MyRepoModel> others = ContainerUtil.newLinkedHashMap();
     for (Map.Entry<RepositoryNode, MyRepoModel> entry : myView2Model.entrySet()) {
       MyRepoModel model = entry.getValue();
-      if (myPreselectedRepositories.contains(model.getRepository())) {
+      Repository repository = model.getRepository();
+      if (preselectByUser(repository)) {
         priorityLoading.put(entry.getKey(), model);
       }
       else if (model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories()) {
@@ -188,6 +193,7 @@ public class PushController implements Disposable {
       @Override
       public void onTargetChanged(T newTarget) {
         repoNode.setChecked(true);
+        myExcludedRepositoryRoots.remove(model.getRepository().getRoot().getPath());
         model.setTarget(newTarget);
         model.clearErrors();
         loadCommits(model, repoNode, false);
@@ -196,9 +202,14 @@ public class PushController implements Disposable {
       @Override
       public void onSelectionChanged(boolean isSelected) {
         myDialog.enableOkActions(isPushAllowed());
-        if (isSelected && !model.hasCommitInfo() && !model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories()) {
-          //download incoming if was not loaded before and marked as selected
-          loadCommits(model, repoNode, false);
+        if (isSelected) {
+          boolean forceLoad = myExcludedRepositoryRoots.remove(model.getRepository().getRoot().getPath());
+          if (!model.hasCommitInfo() && (forceLoad || !model.getSupport().shouldRequestIncomingChangesForNotCheckedRepositories())) {
+            loadCommits(model, repoNode, false);
+          }
+        }
+        else {
+          myExcludedRepositoryRoots.add(model.getRepository().getRoot().getPath());
         }
       }
     });
@@ -235,9 +246,54 @@ public class PushController implements Disposable {
 
   public boolean isPushAllowed() {
     JTree tree = myPushLog.getTree();
-    return !tree.isEditing() && !getSelectedRepoNode().isEmpty() && allNodesAreLoaded(myView2Model.keySet());
+    return !tree.isEditing() &&
+           ContainerUtil.exists(myPushSupports, new Condition<PushSupport<?, ?, ?>>() {
+             @Override
+             public boolean value(PushSupport<?, ?, ?> support) {
+               return isPushAllowed(support);
+             }
+           });
   }
 
+  private boolean isPushAllowed(@NotNull PushSupport<?, ?, ?> pushSupport) {
+    Collection<RepositoryNode> nodes = getNodesForSupport(pushSupport);
+    if (pushSupport.getRepositoryManager().isSyncEnabled()) {
+      return hasSomethingToPush(nodes) || (hasCheckedNode(nodes) && allNodesAreLoaded(nodes));
+    }
+    return hasSomethingToPush(nodes) || (hasCheckedNode(nodes));
+  }
+
+  private boolean hasSomethingToPush(Collection<RepositoryNode> nodes) {
+    return ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
+      @Override
+      public boolean value(@NotNull RepositoryNode node) {
+        PushTarget target = myView2Model.get(node).getTarget();
+        //if node is selected target should not be null
+        return (node.isChecked() || node.isLoading()) && target != null && target.hasSomethingToPush();
+      }
+    });
+  }
+
+  private static boolean hasCheckedNode(@NotNull Collection<RepositoryNode> nodes) {
+    return ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
+      @Override
+      public boolean value(@NotNull RepositoryNode node) {
+        return node.isChecked();
+      }
+    });
+  }
+
+  @NotNull
+  private Collection<RepositoryNode> getNodesForSupport(final PushSupport<?, ?, ?> support) {
+    return ContainerUtil.mapNotNull(myView2Model.entrySet(), new Function<Map.Entry<RepositoryNode, MyRepoModel>, RepositoryNode>() {
+      @Override
+      public RepositoryNode fun(Map.Entry<RepositoryNode, MyRepoModel> entry) {
+        return support.equals(entry.getValue().getSupport()) ? entry.getKey() : null;
+      }
+    });
+  }
+
+
   private static boolean allNodesAreLoaded(@NotNull Collection<RepositoryNode> nodes) {
     return !ContainerUtil.exists(nodes, new Condition<RepositoryNode>() {
       @Override
@@ -294,8 +350,8 @@ public class PushController implements Disposable {
             }
             else {
               List<? extends VcsFullCommitDetails> commits = outgoing.getCommits();
-              shouldBeSelected = shouldSelectInitially(target, repository, model.getSupport().getRepositoryManager(), !commits.isEmpty());
               model.setLoadedCommits(commits);
+              shouldBeSelected = shouldSelect(model);
               myPushLog.setChildren(node,
                                     getPresentationForCommits(PushController.this.myProject, model.getLoadedCommits(),
                                                               model.getNumberOfShownCommits()));
@@ -315,19 +371,24 @@ public class PushController implements Disposable {
     node.startLoading(myPushLog.getTree(), myExecutorService.submit(task, result));
   }
 
-  private boolean shouldSelectInitially(@NotNull PushTarget target, @NotNull Repository repository,
-                                        @NotNull RepositoryManager repositoryManager, boolean hasCommits) {
-    boolean shouldBeSelected;
-    if (mySingleRepoProject) {
-      shouldBeSelected = true;
-    }
-    else if (repositoryManager.isSyncEnabled()) {
-      shouldBeSelected = hasCommits || target.hasSomethingToPush();
-    }
-    else {
-      shouldBeSelected = (hasCommits || target.hasSomethingToPush()) && myPreselectedRepositories.contains(repository);
-    }
-    return shouldBeSelected;
+  private boolean shouldSelect(@NotNull MyRepoModel model) {
+    if (mySingleRepoProject) return true;
+    Repository repository = model.getRepository();
+    return hasCommitsToPush(model) && (preselectByUser(repository) || notExcludedByUser(repository));
+  }
+
+  private boolean notExcludedByUser(@NotNull Repository repository) {
+    return !myExcludedRepositoryRoots.contains(repository.getRoot().getPath());
+  }
+
+  private boolean preselectByUser(@NotNull Repository repository) {
+    return myPreselectedRepositories.contains(repository);
+  }
+
+  private static boolean hasCommitsToPush(@NotNull MyRepoModel model) {
+    PushTarget target = model.getTarget();
+    assert target != null;
+    return (!model.getLoadedCommits().isEmpty() || target.hasSomethingToPush());
   }
 
   public PushLog getPushPanelLog() {
@@ -338,6 +399,7 @@ public class PushController implements Disposable {
     Task.Backgroundable task = new Task.Backgroundable(myProject, "Pushing...", false) {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
+        myExcludedSettings.saveExcludedRepoRoots(myExcludedRepositoryRoots);
         for (PushSupport support : myPushSupports) {
           doPush(support, force);
         }
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
index 0105032eba97..b983e8f46024 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
@@ -69,6 +69,7 @@ class LoadingIcon extends JBImageIcon {
     }
 
     public boolean imageUpdate(Image img, int flags, int x, int y, int w, int h) {
+      if (myNode instanceof RepositoryNode && !((RepositoryNode)myNode).isLoading()) return false;
       if ((flags & (FRAMEBITS | ALLBITS)) != 0) {
         TreeNode[] pathToRoot = myModel.getPathToRoot(myNode);
         if (pathToRoot != null) {
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
index 12236ed4aefe..6a31c1a123b7 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
@@ -155,6 +155,7 @@ public class RepositoryNode extends CheckedTreeNode implements EditableTreeNode,
 
   public void stopLoading() {
     myLoading.set(false);
+    myLoadingIcon.setImageObserver(null);
   }
 
   public boolean isLoading() {
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
index a86d9368e7d2..03fdca55c2c2 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.OptionAction;
+import com.intellij.openapi.ui.ValidationInfo;
 import net.miginfocom.swing.MigLayout;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -81,6 +82,18 @@ public class VcsPushDialog extends DialogWrapper {
     return ID;
   }
 
+  @Nullable
+  @Override
+  protected ValidationInfo doValidate() {
+    enableOkActions(myController.isPushAllowed());
+    return null;
+  }
+
+  @Override
+  protected boolean postponeValidation() {
+    return false;
+  }
+
   @Override
   @NotNull
   protected Action[] createActions() {
diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
index 998620ffa599..4a390bc1383b 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.ui;
 
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
@@ -128,6 +129,9 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
   public UISettings() {
     tweakPlatformDefaults();
     setSystemFontFaceAndSize();
+
+    Boolean scrollToSource = WelcomeWizardUtil.getAutoScrollToSource();
+    if (scrollToSource != null) DEFAULT_AUTOSCROLL_TO_SOURCE = scrollToSource;
   }
 
   private void tweakPlatformDefaults() {
diff --git a/platform/icons/src/general/searchEverywhereGear.png b/platform/icons/src/general/searchEverywhereGear.png
new file mode 100644
index 000000000000..8500a59800e7
Binary files /dev/null and b/platform/icons/src/general/searchEverywhereGear.png differ
diff --git a/platform/icons/src/general/searchEverywhereGear@2x.png b/platform/icons/src/general/searchEverywhereGear@2x.png
new file mode 100644
index 000000000000..bbc8c4eaf04b
Binary files /dev/null and b/platform/icons/src/general/searchEverywhereGear@2x.png differ
diff --git a/platform/icons/src/general/searchEverywhereGear@2x_dark.png b/platform/icons/src/general/searchEverywhereGear@2x_dark.png
new file mode 100644
index 000000000000..a3658d816448
Binary files /dev/null and b/platform/icons/src/general/searchEverywhereGear@2x_dark.png differ
diff --git a/platform/icons/src/general/searchEverywhereGear_dark.png b/platform/icons/src/general/searchEverywhereGear_dark.png
new file mode 100644
index 000000000000..d5848c477552
Binary files /dev/null and b/platform/icons/src/general/searchEverywhereGear_dark.png differ
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
index 764f1bcea51f..a5753c8375bb 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java
@@ -164,6 +164,7 @@ public class StdArrangementTokens {
     @NotNull public static final ArrangementSettingsToken PROPERTY        = invertible("PROPERTY", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken EVENT_HANDLER   = invertible("EVENT_HANDLER", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken STATIC_INIT     = invertible("STATIC_INIT", StdArrangementTokenType.ENTRY_TYPE);
+    @NotNull public static final ArrangementSettingsToken INIT_BLOCK      = invertible("INITIALIZER BLOCK", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken NAMESPACE       = invertible("NAMESPACE", StdArrangementTokenType.ENTRY_TYPE);
     @NotNull public static final ArrangementSettingsToken TRAIT           = invertible("TRAIT", StdArrangementTokenType.ENTRY_TYPE);
 
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
index b27befd36b00..322a273830e5 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
@@ -45,6 +45,7 @@ public class Descriptor {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.Descriptor");
   private final ScopeToolState myState;
   private final InspectionProfileImpl myInspectionProfile;
+  private final String myScopeName;
 
   public Descriptor(@NotNull ScopeToolState state, @NotNull InspectionProfileImpl inspectionProfile, @NotNull Project project) {
     myState = state;
@@ -54,6 +55,7 @@ public class Descriptor {
     final String[] groupPath = tool.getGroupPath();
     myGroup = groupPath.length == 0 ? new String[]{InspectionProfileEntry.GENERAL_GROUP_NAME} : groupPath;
     myKey = HighlightDisplayKey.find(tool.getShortName());
+    myScopeName = state.getScopeName();
     myScope = state.getScope(project);
     myLevel = inspectionProfile.getErrorLevel(myKey, myScope, project);
     myEnabled = inspectionProfile.isToolEnabled(myKey, myScope, project);
@@ -137,6 +139,11 @@ public class Descriptor {
     return myGroup;
   }
 
+  @NotNull
+  public String getScopeName() {
+    return myScopeName;
+  }
+
   @Nullable
   public NamedScope getScope() {
     return myScope;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
index d81fbf692812..1dc2f40f5432 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/VisibleTreeState.java
@@ -176,11 +176,9 @@ public class VisibleTreeState{
       final State other = (State)o;
       if (myKey.equals(other.myKey)) {
         if (myDescriptor != null && other.myDescriptor != null) {
-          final NamedScope scope1 = myDescriptor.getScope();
-          final NamedScope scope2 = other.myDescriptor.getScope();
-          if (scope1 != null && scope2 != null) {
-            return scope1.getName().compareTo(scope2.getName());
-          }
+          final String scope1 = myDescriptor.getScopeName();
+          final String scope2 = other.myDescriptor.getScopeName();
+          return scope1.compareTo(scope2);
         }
       }
       return myKey.compareTo(other.myKey);
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index c9dae095522c..b7f56a69f887 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
@@ -421,7 +422,11 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       }
       //Stage two: try to get content from descriptor itself
       final Content attachedContent = descriptor.getAttachedContent();
-      if (attachedContent != null && attachedContent.isValid() && contentManager.getIndexOfContent(attachedContent) != -1) {
+
+      if (attachedContent != null
+          && attachedContent.isValid()
+          && contentManager.getIndexOfContent(attachedContent) != -1
+          && (Comparing.equal(descriptor.getDisplayName(), attachedContent.getDisplayName()) || !attachedContent.isPinned())) {
         content = attachedContent;
       }
     }
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index 93a33c6ce5ee..c5a1db15c2e4 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -716,7 +716,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
     topPanel.add(title, BorderLayout.WEST);
     final JPanel controls = new JPanel(new BorderLayout());
     controls.setOpaque(false);
-    final JLabel settings = new JLabel(AllIcons.General.WebSettings);
+    final JLabel settings = new JLabel(AllIcons.General.SearchEverywhereGear);
     new ClickListener(){
       @Override
       public boolean onClick(@NotNull MouseEvent event, int clickCount) {
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
index c0f156fedd28..595907aa5720 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
@@ -18,12 +18,15 @@ package com.intellij.ide.hierarchy;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.impl.ContentManagerWatcher;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.ContentManager;
 
 @State(
@@ -46,11 +49,15 @@ public final class HierarchyBrowserManager implements PersistentStateComponent<H
   private final ContentManager myContentManager;
 
   public HierarchyBrowserManager(final Project project) {
-    final ToolWindowManager toolWindowManager=ToolWindowManager.getInstance(project);
-    final ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
+    ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(project);
+    ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.HIERARCHY, true, ToolWindowAnchor.RIGHT, project);
+    DefaultActionGroup gearActions = new DefaultActionGroup();
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(project, toolWindow)).setAsSecondary(true);
+    ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
+
     myContentManager = toolWindow.getContentManager();
     toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowHierarchy);
-    new ContentManagerWatcher(toolWindow,myContentManager);
+    new ContentManagerWatcher(toolWindow, myContentManager);
   }
 
   public final ContentManager getContentManager() {
diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
index 0830e9b8b22a..ecdc9dd73da0 100644
--- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.java
@@ -36,6 +36,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
@@ -69,6 +70,7 @@ import java.util.List;
 public class StructureViewWrapperImpl implements StructureViewWrapper, Disposable {
   private final Project myProject;
   private final ToolWindowEx myToolWindow;
+  private final AnAction myShowToolbarAction;
 
   private VirtualFile myFile;
 
@@ -90,6 +92,7 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
   public StructureViewWrapperImpl(Project project, ToolWindowEx toolWindow) {
     myProject = project;
     myToolWindow = toolWindow;
+    myShowToolbarAction = SimpleToolWindowPanel.createToggleToolbarAction(project, myToolWindow);
 
     myUpdateQueue = new MergingUpdateQueue("StructureView", Registry.intValue("structureView.coalesceTime"), false, myToolWindow.getComponent(), this, myToolWindow.getComponent(), true);
     myUpdateQueue.setRestartTimerOnAdd(true);
@@ -365,12 +368,13 @@ public class StructureViewWrapperImpl implements StructureViewWrapper, Disposabl
   }
 
   private void updateHeaderActions(StructureView structureView) {
-    ActionGroup gearActions = null;
+    DefaultActionGroup gearActions = new DefaultActionGroup();
     AnAction[] titleActions = AnAction.EMPTY_ARRAY;
     if (structureView instanceof StructureViewComponent) {
-      gearActions = ((StructureViewComponent)structureView).getGearActions();
+      gearActions.addAll(((StructureViewComponent)structureView).getGearActions());
       titleActions = ((StructureViewComponent)structureView).getTitleActions();
     }
+    gearActions.addAction(myShowToolbarAction).setAsSecondary(true);
     myToolWindow.setAdditionalGearActions(gearActions);
     myToolWindow.setTitleActions(titleActions);
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
index ec0b9dd8b6c6..7447fa3006c5 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
@@ -321,9 +321,13 @@ public class PsiDirectoryNode extends BasePsiNode<PsiDirectory> implements Navig
   @Override
   public Comparable getTypeSortKey() {
     VirtualFile file = getVirtualFile();
-    if (file == null) return null;
-    String extension = file.getExtension();
-    return extension == null ? null : new PsiFileNode.ExtensionSortKey(extension);
+    if (file != null) {
+      String extension = file.getExtension();
+      if (extension != null) {
+        return new PsiFileNode.ExtensionSortKey(extension);
+      }
+    }
+    return null;
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
index 7d7990a06a41..b350d1f330c9 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/impl/StructureViewFactoryImpl.java
@@ -54,7 +54,6 @@ public final class StructureViewFactoryImpl extends StructureViewFactoryEx imple
     @SuppressWarnings({"WeakerAccess"}) public boolean AUTOSCROLL_MODE = true;
     @SuppressWarnings({"WeakerAccess"}) public boolean AUTOSCROLL_FROM_SOURCE = false;
     @SuppressWarnings({"WeakerAccess"}) public String ACTIVE_ACTIONS = "";
-    public boolean SHOW_TOOLBAR = false;
   }
 
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
index 6363a299539e..3e9eabbfbaa7 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
@@ -154,9 +154,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
     myAutoScrollToSourceHandler = new MyAutoScrollToSourceHandler();
     myAutoScrollFromSourceHandler = new MyAutoScrollFromSourceHandler(myProject, this);
 
-    if (getSettings().SHOW_TOOLBAR) {
-      setToolbar(createToolbar());
-    }
+    setToolbar(createToolbar());
 
     installTree();
 
@@ -390,25 +388,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
   }
 
   public ActionGroup getGearActions() {
-    DefaultActionGroup group = createActionGroup(true);
-    group.addAction(new ToggleAction("Show Toolbar") {
-      @Override
-      public boolean isDumbAware() {
-        return true;
-      }
-
-      @Override
-      public boolean isSelected(AnActionEvent e) {
-        return getSettings().SHOW_TOOLBAR;
-      }
-
-      @Override
-      public void setSelected(AnActionEvent e, boolean state) {
-        setToolbar(state ? createToolbar() : null);
-        getSettings().SHOW_TOOLBAR = state;
-      }
-    }).setAsSecondary(true);
-    return group;
+    return createActionGroup(true);
   }
 
   private StructureViewFactoryImpl.State getSettings() {
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
index 28118dd382d9..5c5f8c745c73 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
@@ -241,9 +241,8 @@ public class SingleInspectionProfilePanel extends JPanel {
     } else {
       for (ScopeToolState candidate : mySelectedProfile
         .getNonDefaultTools(descriptor.getKey().toString(), myProjectProfileManager.getProject())) {
-        final NamedScope scope = descriptor.getScope();
-        LOG.assertTrue(scope != null);
-        if (Comparing.equal(candidate.getScopeName(), scope.getName())) {
+        final String scope = descriptor.getScopeName();
+        if (Comparing.equal(candidate.getScopeName(), scope)) {
           state = candidate;
           break;
         }
diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
index b2ee89c11e2e..bf76c18e94d5 100644
--- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
@@ -18,12 +18,15 @@ package com.intellij.usageView.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.impl.ContentManagerWatcher;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.*;
 import com.intellij.usageView.UsageViewManager;
 import com.intellij.usages.UsageView;
@@ -41,6 +44,10 @@ public class UsageViewManagerImpl extends UsageViewManager {
     ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true);
     toolWindow.setToHideOnEmptyContent(true);
     toolWindow.setIcon(AllIcons.Toolwindows.ToolWindowFind);
+    DefaultActionGroup gearActions = new DefaultActionGroup();
+    gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(project, toolWindow)).setAsSecondary(true);
+    ((ToolWindowEx)toolWindow).setAdditionalGearActions(gearActions);
+
     myFindContentManager = toolWindow.getContentManager();
     myFindContentManager.addContentManagerListener(new ContentManagerAdapter() {
       @Override
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
index 751d41eab358..c4523819c0f1 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
@@ -15,20 +15,28 @@
  */
 package com.intellij.openapi.ui;
 
-import com.intellij.openapi.actionSystem.ActionToolbar;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.wm.ToolWindow;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.ContentManagerAdapter;
+import com.intellij.ui.content.ContentManagerEvent;
 import com.intellij.ui.switcher.QuickActionProvider;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.AwtVisitor;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ContainerAdapter;
 import java.awt.event.ContainerEvent;
+import java.util.LinkedList;
 import java.util.List;
 
 public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider, DataProvider {
@@ -74,6 +82,10 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
     });
   }
 
+  public boolean isToolbarVisible() {
+    return myToolbar != null && myToolbar.isVisible();
+  }
+
   public void setToolbar(@Nullable JComponent c) {
     if (c == null) {
       remove(myToolbar);
@@ -159,4 +171,67 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
       }
     }
   }
+
+  @NotNull
+  public static AnAction createToggleToolbarAction(Project project, @NotNull ToolWindow toolWindow) {
+    return new ToggleToolbarAction(toolWindow, PropertiesComponent.getInstance(project));
+  }
+
+  private static class ToggleToolbarAction extends ToggleAction implements DumbAware {
+
+    private final PropertiesComponent myPropertiesComponent;
+    private final ToolWindow myToolWindow;
+
+    private ToggleToolbarAction(@NotNull ToolWindow toolWindow, @NotNull PropertiesComponent propertiesComponent) {
+      super("Show Toolbar");
+      myPropertiesComponent = propertiesComponent;
+      myToolWindow = toolWindow;
+      myToolWindow.getContentManager().addContentManagerListener(new ContentManagerAdapter() {
+        @Override
+        public void contentAdded(ContentManagerEvent event) {
+          setContentToolbarVisible(event.getContent(), getVisibilityValue());
+        }
+      });
+    }
+
+    @Override
+    public boolean isSelected(AnActionEvent e) {
+      return getVisibilityValue();
+    }
+
+    @Override
+    public void setSelected(AnActionEvent e, boolean state) {
+      myPropertiesComponent.setValue(getProperty(), String.valueOf(state), String.valueOf(true));
+      for (Content content : myToolWindow.getContentManager().getContents()) {
+        setContentToolbarVisible(content, state);
+      }
+    }
+
+    @NotNull
+    private String getProperty() {
+      return myToolWindow.getStripeTitle() + ".ShowToolbar";
+    }
+
+    private boolean getVisibilityValue() {
+      return myPropertiesComponent.getBoolean(getProperty(), true);
+    }
+
+    private static void setContentToolbarVisible(Content content, boolean state) {
+      LinkedList<JComponent> deque = ContainerUtil.newLinkedList(content.getComponent());
+      while(!deque.isEmpty()) {
+        JComponent component = deque.pollFirst();
+        if (!(component instanceof JPanel)) continue;
+
+        for (int i = 0, count = component.getComponentCount(); i < count; i++) {
+          Component c = component.getComponent(i);
+          if (c instanceof ActionToolbar) {
+            c.setVisible(state);
+          }
+          else if (c instanceof JPanel) {
+            deque.addLast((JPanel)c);
+          }
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
index 3d2ae0575e1f..70561034a3ea 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
+++ b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.form
@@ -1,58 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.util.net.HttpProxySettingsUi">
-  <grid id="111c4" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="11" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="111c4" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="12" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="111" y="44" width="1369" height="608"/>
+      <xy x="1" y="44" width="1134" height="648"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="fe3b6" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="5" left="20" bottom="10" right="10"/>
+      <grid id="fe3b6" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
-          <component id="2a6e8" class="javax.swing.JLabel" binding="myHostNameLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <labelFor value="2008d"/>
-              <text resource-bundle="messages/CommonBundle" key="editbox.host.name"/>
-            </properties>
-          </component>
-          <component id="a2263" class="javax.swing.JLabel" binding="myPortNumberLabel">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <labelFor value="7e62"/>
-              <text resource-bundle="messages/CommonBundle" key="editbox.port.number"/>
-            </properties>
-          </component>
           <component id="7e62" class="com.intellij.ui.PortField" binding="myProxyPortTextField">
             <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
           </component>
-          <component id="29784" class="javax.swing.JCheckBox" binding="myProxyAuthCheckBox">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <margin top="2" left="1" bottom="2" right="2"/>
-              <selected value="false"/>
-              <text resource-bundle="messages/CommonBundle" key="checkbox.proxy.authentication"/>
-            </properties>
-          </component>
           <component id="fc937" class="javax.swing.JTextField" binding="myProxyLoginTextField">
             <constraints>
-              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -62,15 +34,67 @@
           </component>
           <component id="1acb8" class="javax.swing.JPasswordField" binding="myProxyPasswordTextField">
             <constraints>
-              <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
+          <component id="cc77" class="javax.swing.JLabel" binding="myProxyExceptionsLabel">
+            <constraints>
+              <grid row="3" column="1" 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="messages/CommonBundle" key="label.proxy.exceptions.text"/>
+            </properties>
+          </component>
+          <component id="2008d" class="javax.swing.JTextField" binding="myProxyHostTextField">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="51cae" class="javax.swing.JCheckBox" binding="myRememberProxyPasswordCheckBox">
+            <constraints>
+              <grid row="7" column="1" 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="messages/CommonBundle" key="checkbox.remember.password"/>
+            </properties>
+          </component>
+          <component id="2a6e8" class="javax.swing.JLabel" binding="myHostNameLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="2008d"/>
+              <text resource-bundle="messages/CommonBundle" key="editbox.host.name"/>
+            </properties>
+          </component>
+          <component id="a2263" class="javax.swing.JLabel" binding="myPortNumberLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="7e62"/>
+              <text resource-bundle="messages/CommonBundle" key="editbox.port.number"/>
+            </properties>
+          </component>
+          <component id="29784" class="javax.swing.JCheckBox" binding="myProxyAuthCheckBox">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <margin top="2" left="1" bottom="2" right="2"/>
+              <selected value="false"/>
+              <text resource-bundle="messages/CommonBundle" key="checkbox.proxy.authentication"/>
+            </properties>
+          </component>
           <component id="e8502" class="javax.swing.JLabel" binding="myProxyLoginLabel">
             <constraints>
-              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="4" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="fc937"/>
@@ -79,67 +103,39 @@
           </component>
           <component id="7ced" class="javax.swing.JLabel" binding="myProxyPasswordLabel">
             <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="4" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="1acb8"/>
               <text resource-bundle="messages/CommonBundle" key="editbox.password"/>
             </properties>
           </component>
-          <component id="51cae" class="javax.swing.JCheckBox" binding="myRememberProxyPasswordCheckBox">
+          <component id="8655a" class="com.intellij.ui.RawCommandLineEditor" binding="myProxyExceptions">
             <constraints>
-              <grid row="7" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <margin top="2" left="15" bottom="2" right="2"/>
-              <text resource-bundle="messages/CommonBundle" key="checkbox.remember.password"/>
-            </properties>
-          </component>
-          <component id="a16e5" class="javax.swing.JTextArea" binding="myProxyExceptions">
-            <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
-            </constraints>
-            <properties>
-              <lineWrap value="true"/>
-              <toolTipText value=""/>
+              <dialogCaption value="Proxy exceptions"/>
             </properties>
           </component>
           <component id="ad79c" class="javax.swing.JLabel" binding="myNoProxyForLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="No proxy for:"/>
             </properties>
           </component>
-          <component id="cc77" class="javax.swing.JLabel" binding="myProxyExceptionsLabel">
-            <constraints>
-              <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/CommonBundle" key="label.proxy.exceptions.text"/>
-            </properties>
-          </component>
-          <component id="2008d" class="javax.swing.JTextField" binding="myProxyHostTextField">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
         </children>
       </grid>
       <vspacer id="53d33">
         <constraints>
-          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="862df" class="com.intellij.ui.components.JBRadioButton" binding="myAutoDetectProxyRb" default-binding="true">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <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="messages/CommonBundle" key="checkbox.use.http.proxy.pac"/>
@@ -148,23 +144,25 @@
       </component>
       <component id="9e485" class="com.intellij.ui.components.JBRadioButton" binding="myUseHTTPProxyRb" default-binding="true">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="6" 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="messages/CommonBundle" key="checkbox.use.http.proxy"/>
         </properties>
       </component>
-      <component id="4b9f9" class="com.intellij.ui.components.JBLabel" binding="mySystemProxyDefined">
+      <component id="4b9f9" class="javax.swing.JLabel" binding="mySystemProxyDefined">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" 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="messages/CommonBundle" key="label.system.proxy.used"/>
+          <verticalAlignment value="0"/>
+          <verticalTextPosition value="1"/>
         </properties>
       </component>
       <component id="b027d" class="com.intellij.ui.components.JBRadioButton" binding="myNoProxyRb">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" 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="messages/CommonBundle" key="http.noproxy"/>
@@ -173,14 +171,14 @@
       <grid id="1bb9b" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="5a9f8" class="com.intellij.ui.components.JBRadioButton" binding="myHTTP">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CommonBundle" key="http.proxy.type"/>
@@ -188,7 +186,7 @@
           </component>
           <component id="2538c" class="com.intellij.ui.components.JBRadioButton" binding="mySocks">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="messages/CommonBundle" key="socks.proxy.type"/>
@@ -198,7 +196,7 @@
       </grid>
       <component id="ffae6" class="javax.swing.JLabel" binding="myErrorLabel">
         <constraints>
-          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="10" 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 value="Label"/>
@@ -206,22 +204,24 @@
       </component>
       <component id="de36" class="javax.swing.JButton" binding="myCheckButton">
         <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="9" 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="Check connection"/>
         </properties>
       </component>
-      <component id="98030" class="com.intellij.ui.components.JBLabel" binding="myOtherWarning">
+      <component id="98030" class="javax.swing.JLabel" binding="myOtherWarning">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <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/>
+        <properties>
+          <verticalTextPosition value="1"/>
+        </properties>
       </component>
-      <grid id="fee34" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="fee34" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -234,14 +234,6 @@
               <text resource-bundle="messages/CommonBundle" key="checkbox.automatic.proxy.configuration.url"/>
             </properties>
           </component>
-          <component id="c299" class="javax.swing.JButton" binding="myClearPasswordsButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/CommonBundle" key="autodetected.proxies.clear.button"/>
-            </properties>
-          </component>
           <component id="77d11" class="javax.swing.JTextField" binding="myPacUrlTextField">
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
@@ -252,6 +244,14 @@
           </component>
         </children>
       </grid>
+      <component id="c299" class="javax.swing.JButton" binding="myClearPasswordsButton" default-binding="true">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="messages/CommonBundle" key="autodetected.proxies.clear.button"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
index e71d8e5af4ec..f4c849f015f7 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpProxySettingsUi.java
@@ -21,17 +21,16 @@ import com.google.common.net.InternetDomainName;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ConfigurableUi;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.ui.PortField;
-import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.RawCommandLineEditor;
+import com.intellij.ui.RelativeFont;
 import com.intellij.ui.components.JBRadioButton;
 import com.intellij.util.proxy.CommonProxy;
 import com.intellij.util.proxy.JavaProxyProperty;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -59,16 +58,16 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
   private JLabel myPortNumberLabel;
   private JBRadioButton myAutoDetectProxyRb;
   private JBRadioButton myUseHTTPProxyRb;
-  private JBLabel mySystemProxyDefined;
+  private JLabel mySystemProxyDefined;
   private JBRadioButton myNoProxyRb;
   private JBRadioButton myHTTP;
   private JBRadioButton mySocks;
   private JButton myClearPasswordsButton;
   private JLabel myErrorLabel;
   private JButton myCheckButton;
-  private JBLabel myOtherWarning;
+  private JLabel myOtherWarning;
   private JLabel myProxyExceptionsLabel;
-  private JTextArea myProxyExceptions;
+  private RawCommandLineEditor myProxyExceptions;
   private JLabel myNoProxyForLabel;
   private JCheckBox myPacUrlCheckBox;
   private JTextField myPacUrlTextField;
@@ -106,14 +105,11 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     proxyTypeGroup.add(mySocks);
     myHTTP.setSelected(true);
 
-    myProxyExceptions.setBorder(UIUtil.getTextFieldBorder());
-
     Boolean property = Boolean.getBoolean(JavaProxyProperty.USE_SYSTEM_PROXY);
     mySystemProxyDefined.setVisible(Boolean.TRUE.equals(property));
     if (Boolean.TRUE.equals(property)) {
       mySystemProxyDefined.setIcon(Messages.getWarningIcon());
-      mySystemProxyDefined.setFont(mySystemProxyDefined.getFont().deriveFont(Font.BOLD));
-      mySystemProxyDefined.setUI(new MultiLineLabelUI());
+      RelativeFont.BOLD.install(mySystemProxyDefined);
     }
 
     myProxyAuthCheckBox.addActionListener(new ActionListener() {
@@ -270,7 +266,6 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     myOtherWarning.setVisible(oldStyleText != null);
     if (oldStyleText != null) {
       myOtherWarning.setText(oldStyleText);
-      myOtherWarning.setUI(new MultiLineLabelUI());
       myOtherWarning.setIcon(Messages.getWarningIcon());
     }
   }
@@ -354,7 +349,6 @@ class HttpProxySettingsUi implements ConfigurableUi<HttpConfigurable> {
     mySocks.setEnabled(enabled);
     myHTTP.setEnabled(enabled);
     myProxyExceptions.setEnabled(enabled);
-    myProxyExceptions.setBackground(myProxyPortTextField.getBackground());
     myProxyExceptionsLabel.setEnabled(enabled);
     myNoProxyForLabel.setEnabled(enabled);
 
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
index 4afd28d9f893..196d36ea5a6b 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
@@ -15,18 +15,33 @@
  */
 package com.intellij.ide.actions;
 
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
+import com.intellij.ide.ui.LafManager;
+import com.intellij.ide.ui.UISettings;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
+import com.intellij.openapi.editor.ex.util.EditorUtil;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.RegistryValue;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 public class ToggleDistractionFreeModeAction extends AnAction implements DumbAware {
   private static final String key = "editor.distraction.free.mode";
+
   @Override
   public void update(@NotNull AnActionEvent e) {
+    if (e.getProject() == null) {
+      e.getPresentation().setEnabled(false);
+      return;
+    }
     RegistryValue value = Registry.get(key);
     boolean selected = value.asBoolean();
     e.getPresentation().setText((selected ? "Exit" : "Enter") + " Distraction Free Mode");
@@ -34,8 +49,58 @@ public class ToggleDistractionFreeModeAction extends AnAction implements DumbAwa
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
+    Project project = e.getProject();
     RegistryValue value = Registry.get(key);
-    value.setValue(!value.asBoolean());
+    boolean v = !value.asBoolean();
+    value.setValue(v);
+
+    if (project == null) return;
+
+    PropertiesComponent p = PropertiesComponent.getInstance(project);
+    UISettings ui = UISettings.getInstance();
+    EditorSettingsExternalizable.OptionSet eo = EditorSettingsExternalizable.getInstance().getOptions();
+    DaemonCodeAnalyzerSettings ds = DaemonCodeAnalyzerSettings.getInstance();
+
+    String before = "BEFORE.DISTRACTION.MODE.";
+    if (v) {
+      p.setValue(before + "SHOW_STATUS_BAR", String.valueOf(ui.SHOW_STATUS_BAR)); ui.SHOW_STATUS_BAR = false; 
+      p.setValue(before + "SHOW_MAIN_TOOLBAR", String.valueOf(ui.SHOW_MAIN_TOOLBAR)); ui.SHOW_MAIN_TOOLBAR = false; 
+      p.setValue(before + "SHOW_NAVIGATION_BAR", String.valueOf(ui.SHOW_NAVIGATION_BAR)); ui.SHOW_NAVIGATION_BAR = false; 
+      p.setValue(before + "HIDE_TOOL_STRIPES", String.valueOf(ui.HIDE_TOOL_STRIPES)); ui.HIDE_TOOL_STRIPES = true;
+      p.setValue(before + "EDITOR_TAB_PLACEMENT", String.valueOf(ui.EDITOR_TAB_PLACEMENT)); ui.EDITOR_TAB_PLACEMENT = UISettings.TABS_NONE;
+
+      p.setValue(before + "IS_FOLDING_OUTLINE_SHOWN", String.valueOf(eo.IS_FOLDING_OUTLINE_SHOWN)); eo.IS_FOLDING_OUTLINE_SHOWN = false; 
+      p.setValue(before + "IS_WHITESPACES_SHOWN", String.valueOf(eo.IS_WHITESPACES_SHOWN)); eo.IS_WHITESPACES_SHOWN = false; 
+      p.setValue(before + "ARE_LINE_NUMBERS_SHOWN", String.valueOf(eo.ARE_LINE_NUMBERS_SHOWN)); eo.ARE_LINE_NUMBERS_SHOWN = false; 
+      //p.setValue(before + "IS_RIGHT_MARGIN_SHOWN", String.valueOf(eo.IS_RIGHT_MARGIN_SHOWN)); eo.IS_RIGHT_MARGIN_SHOWN = false; 
+      p.setValue(before + "IS_INDENT_GUIDES_SHOWN", String.valueOf(eo.IS_INDENT_GUIDES_SHOWN)); eo.IS_INDENT_GUIDES_SHOWN = false; 
+      
+      p.setValue(before + "SHOW_METHOD_SEPARATORS", String.valueOf(ds.SHOW_METHOD_SEPARATORS)); ds.SHOW_METHOD_SEPARATORS = false; 
+      
+      TogglePresentationModeAction.storeToolWindows(project);
+    }
+    else {
+      ui.SHOW_STATUS_BAR = p.getBoolean(before + "SHOW_STATUS_BAR", true);
+      ui.SHOW_MAIN_TOOLBAR = p.getBoolean(before + "SHOW_MAIN_TOOLBAR", true);
+      ui.SHOW_NAVIGATION_BAR = p.getBoolean(before + "SHOW_NAVIGATION_BAR", true);
+      ui.HIDE_TOOL_STRIPES = p.getBoolean(before + "HIDE_TOOL_STRIPES", true);
+      ui.EDITOR_TAB_PLACEMENT = p.getOrInitInt(before + "EDITOR_TAB_PLACEMENT", SwingConstants.TOP);
+
+      eo.IS_FOLDING_OUTLINE_SHOWN = p.getBoolean(before + "IS_FOLDING_OUTLINE_SHOWN", true);
+      eo.IS_WHITESPACES_SHOWN = p.getBoolean(before + "IS_WHITESPACES_SHOWN", false);
+      eo.ARE_LINE_NUMBERS_SHOWN = p.getBoolean(before + "ARE_LINE_NUMBERS_SHOWN", false);
+      //eo.IS_RIGHT_MARGIN_SHOWN = p.getBoolean(before + "IS_RIGHT_MARGIN_SHOWN", true);
+      eo.IS_INDENT_GUIDES_SHOWN = p.getBoolean(before + "IS_INDENT_GUIDES_SHOWN", false);
+      
+      ds.SHOW_METHOD_SEPARATORS = p.getBoolean(before + "SHOW_METHOD_SEPARATORS", false);
+
+      TogglePresentationModeAction.restoreToolWindows(project, true, false);
+    }
+
+    UISettings.getInstance().fireUISettingsChanged();
+    LafManager.getInstance().updateUI();
+    EditorUtil.reinitSettings();
+    DaemonCodeAnalyzer.getInstance(project).settingsChanged();
     EditorFactory.getInstance().refreshAllEditors();
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
index 78b84652563c..16dae889b101 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
@@ -180,7 +180,7 @@ public class TogglePresentationModeAction extends AnAction implements DumbAware
     return hasVisible;
   }
 
-  private static boolean storeToolWindows(@Nullable Project project) {
+  static boolean storeToolWindows(@Nullable Project project) {
     if (project == null) return false;
     ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(project);
 
@@ -195,7 +195,7 @@ public class TogglePresentationModeAction extends AnAction implements DumbAware
     return hasVisible;
   }
 
-  private static void restoreToolWindows(Project project, boolean needsRestore, boolean inPresentation) {
+  static void restoreToolWindows(Project project, boolean needsRestore, boolean inPresentation) {
     if (project == null || !needsRestore) return;
     ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(project);
     DesktopLayout restoreLayout = manager.getLayoutToRestoreLater();
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
index 4371c3c991cf..61b3ac4ab20c 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
@@ -56,10 +56,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
   public CustomizeFeaturedPluginsStepPanel(PluginGroups pluginGroups) throws OfflineException {
     setLayout(new GridLayout(1, 1));
     JPanel gridPanel = new JPanel(new GridLayout(0, 3));
-    JBScrollPane scrollPane =
-      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
-    scrollPane.setBorder(null);
+    JBScrollPane scrollPane = CustomizePluginsStepPanel.createScrollPane(gridPanel);
 
     Map<String, String> config = pluginGroups.getFeaturedPlugins();
     boolean isEmptyOrOffline = true;
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
index 53b215516c09..1b1779141ab6 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
@@ -16,7 +16,7 @@
 package com.intellij.ide.customize;
 
 import com.intellij.CommonBundle;
-import com.intellij.idea.StartupUtil;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -37,7 +37,7 @@ public class CustomizeKeyboardSchemeStepPanel extends AbstractCustomizeWizardSte
     myMacPanel = createBigButtonPanel(new VerticalFlowLayout(), macRadioButton, new Runnable() {
       @Override
       public void run() {
-        StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP);
+        WelcomeWizardUtil.setWizardKeymap(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP);
       }
     });
     String style = "<style type=\"text/css\">" +
@@ -62,7 +62,7 @@ public class CustomizeKeyboardSchemeStepPanel extends AbstractCustomizeWizardSte
     myDefaultPanel = createBigButtonPanel(new VerticalFlowLayout(),defaultRadioButton, new Runnable() {
       @Override
       public void run() {
-        StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_KEYMAP);
+        WelcomeWizardUtil.setWizardKeymap(KeymapManager.MAC_OS_X_KEYMAP);
       }
     } );
     myDefaultPanel.add(defaultRadioButton);
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
index de12269b5887..38630cd80708 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java
@@ -30,6 +30,7 @@ import com.intellij.ui.components.labels.LinkListener;
 
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -60,10 +61,7 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
     setLayout(myCardLayout);
     JPanel gridPanel = new JPanel(new GridLayout(0, COLS));
     myCustomizePanel = new IdSetPanel();
-    JBScrollPane scrollPane =
-      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
-    scrollPane.setBorder(null);
+    JBScrollPane scrollPane = createScrollPane(gridPanel);
     add(scrollPane, MAIN);
     add(myCustomizePanel, CUSTOMIZE);
 
@@ -144,6 +142,14 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
     }
   }
 
+  static JBScrollPane createScrollPane(JPanel gridPanel) {
+    JBScrollPane scrollPane =
+      new JBScrollPane(gridPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+    scrollPane.getVerticalScrollBar().setUnitIncrement(10);
+    scrollPane.setBorder(new EmptyBorder(0, 0, 0, 0)); // to disallow resetting border on LaF change
+    return scrollPane;
+  }
+
   @Override
   public void linkSelected(LinkLabel linkLabel, String command) {
     if (command == null || !command.contains(":")) return;
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
index c7b29ef53827..433110bba622 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
@@ -16,64 +16,96 @@
 package com.intellij.ide.customize;
 
 import com.intellij.CommonBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.laf.IntelliJLaf;
 import com.intellij.ide.ui.laf.darcula.DarculaLaf;
-import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.OptionsBundle;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.IconUtil;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
-  protected static final String DEFAULT = "Default";
-  protected static final String DARCULA = "Darcula";
-  protected static final String INTELLIJ = "IntelliJ";
-  protected static final String ALLOY = "Alloy. IDEA Theme";
-  protected static final String GTK = "GTK+";
+  public static class ThemeInfo {
+    public final String name;
+    public final String previewFileName;
+    public final String laf;
+    
+    private Icon icon; 
+
+    public ThemeInfo(String name, String previewFileName, String laf) {
+      this.name = name;
+      this.previewFileName = previewFileName;
+      this.laf = laf;
+    }
+
+    private Icon getIcon() {
+      if (icon == null) {
+        String selector;
+        if (SystemInfo.isMac) {
+          selector = "OSX";
+        }
+        else if (SystemInfo.isWindows) {
+          selector = "Windows";
+        }
+        else {
+          selector = "Linux";
+        }
+        icon = IconLoader.getIcon("/lafs/" + selector + previewFileName + ".png");
+      }
+      return icon;
+    }
+    
+    public void apply() {
+    }
+  }
+  protected static final ThemeInfo AQUA = new ThemeInfo("Default", "Aqua", "com.apple.laf.AquaLookAndFeel");
+  protected static final ThemeInfo DARCULA = new ThemeInfo("Darcula", "Darcula", DarculaLaf.class.getName());
+  protected static final ThemeInfo INTELLIJ = new ThemeInfo("IntelliJ", "IntelliJ", IntelliJLaf.class.getName());
+  protected static final ThemeInfo ALLOY = new ThemeInfo("Alloy. IDEA Theme", "Alloy", "com.incors.plaf.alloy.AlloyIdea");
+  protected static final ThemeInfo GTK = new ThemeInfo("GTK+", "GTK", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
 
   private boolean myInitial = true;
   private boolean myColumnMode;
   private JLabel myPreviewLabel;
-  private Map<String, Icon> myLafNames = new LinkedHashMap<String, Icon>();
+  private Set<ThemeInfo> myThemes = new LinkedHashSet<ThemeInfo>();
 
   public CustomizeUIThemeStepPanel() {
     setLayout(createSmallBorderLayout());
     IconLoader.activate();
 
-    initLafs();
+    initThemes(myThemes);
 
-    myColumnMode = myLafNames.size() > 2;
-    JPanel buttonsPanel = new JPanel(new GridLayout(myColumnMode ? myLafNames.size() : 1, myColumnMode ? 1 : myLafNames.size(), 5, 5));
+    myColumnMode = myThemes.size() > 2;
+    JPanel buttonsPanel = new JPanel(new GridLayout(myColumnMode ? myThemes.size() : 1, myColumnMode ? 1 : myThemes.size(), 5, 5));
     ButtonGroup group = new ButtonGroup();
-    String myDefaultLafName = null;
+    ThemeInfo myDefaultTheme = null;
 
-    for (Map.Entry<String, Icon> entry : myLafNames.entrySet()) {
-      final String lafName = entry.getKey();
-      Icon icon = entry.getValue();
-      final JRadioButton radioButton = new JRadioButton(lafName, myDefaultLafName == null);
+    for (final ThemeInfo theme: myThemes) {
+      final JRadioButton radioButton = new JRadioButton(theme.name, myDefaultTheme == null);
       radioButton.setOpaque(false);
-      if (myDefaultLafName == null) {
+      if (myDefaultTheme == null) {
         radioButton.setSelected(true);
-        myDefaultLafName = lafName;
+        myDefaultTheme = theme;
       }
       final JPanel panel = createBigButtonPanel(createSmallBorderLayout(), radioButton, new Runnable() {
         @Override
         public void run() {
-          applyLaf(lafName, CustomizeUIThemeStepPanel.this);
+          applyLaf(theme, CustomizeUIThemeStepPanel.this);
+          theme.apply();
         }
       });
       panel.setBorder(createSmallEmptyBorder());
       panel.add(radioButton, myColumnMode ? BorderLayout.WEST : BorderLayout.NORTH);
+      Icon icon = theme.getIcon();
       final JLabel label = new JLabel(myColumnMode ? IconUtil.scale(IconUtil.cropIcon(icon, icon.getIconWidth() * 2 / 3, icon.getIconHeight() * 2 / 3), .5) : icon);
       label.setVerticalAlignment(SwingConstants.TOP);
       label.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -92,35 +124,31 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
       wrapperPanel.add(myPreviewLabel);
       add(wrapperPanel, BorderLayout.CENTER);
     }
-    applyLaf(myDefaultLafName, this);
+    applyLaf(myDefaultTheme, this);
     myInitial = false;
   }
 
-  protected void initLafs() {
+  protected void initThemes(Collection<ThemeInfo> result) {
     if (SystemInfo.isMac) {
-      addLaf(DEFAULT, "/lafs/OSXAqua.png");
-      addLaf(DARCULA, "/lafs/OSXDarcula.png");
+      result.add(AQUA);
+      result.add(DARCULA);
     }
     else if (SystemInfo.isWindows) {
       //if (PlatformUtils.isIdeaCommunity()) {
-      addLaf(INTELLIJ,"/lafs/WindowsIntelliJ.png");
+      result.add(INTELLIJ);
       //}
       //else {
-      //  addLaf(ALLOY, "/lafs/WindowsAlloy.png");
+      //  addLaf(ALLOY);
       //}
-      addLaf(DARCULA, "/lafs/WindowsDarcula.png");
+      result.add(DARCULA);
     }
     else {
-      addLaf(INTELLIJ, "/lafs/LinuxIntelliJ.png");
-      addLaf(DARCULA, "/lafs/LinuxDarcula.png");
-      addLaf(GTK, "/lafs/LinuxGTK.png");
+      result.add(INTELLIJ);
+      result.add(DARCULA);
+      result.add(GTK);
     }
   }
 
-  protected final void addLaf(String name, String icon) {
-    myLafNames.put(name, IconLoader.getIcon(icon));
-  }
-
   @Override
   public Dimension getPreferredSize() {
     Dimension size = super.getPreferredSize();
@@ -146,17 +174,14 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
            + " | " + "Appearance";
   }
 
-  private void applyLaf(String lafName, Component component) {
-    UIManager.LookAndFeelInfo info = getLookAndFeelInfo(lafName);
+  private void applyLaf(ThemeInfo theme, Component component) {
+    UIManager.LookAndFeelInfo info = new UIManager.LookAndFeelInfo(theme.name, theme.laf);
     if (info == null) return;
     try {
       UIManager.setLookAndFeel(info.getClassName());
       String className = info.getClassName();
-      if (lafName == DARCULA) {
-        className = DarculaLookAndFeelInfo.CLASS_NAME;
-      }
       if (!myInitial) {
-        StartupUtil.setWizardLAF(className);
+        WelcomeWizardUtil.setWizardLAF(className);
       }
       Window window = SwingUtilities.getWindowAncestor(component);
       if (window != null) {
@@ -169,7 +194,7 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
         LafManager.getInstance().setCurrentLookAndFeel(info);
       }
       if (myColumnMode) {
-        myPreviewLabel.setIcon(myLafNames.get(lafName));
+        myPreviewLabel.setIcon(theme.getIcon());
         myPreviewLabel.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Label.disabledForeground")));
       }
     }
@@ -186,14 +211,4 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
       e.printStackTrace();
     }
   }
-
-  @Nullable
-  private static UIManager.LookAndFeelInfo getLookAndFeelInfo(String name) {
-    if (DEFAULT.equals(name)) return new UIManager.LookAndFeelInfo(DEFAULT, "com.apple.laf.AquaLookAndFeel");
-    if (DARCULA.equals(name)) return new UIManager.LookAndFeelInfo(DARCULA, DarculaLaf.class.getName());
-    if (INTELLIJ.equals(name)) return new UIManager.LookAndFeelInfo(INTELLIJ, IntelliJLaf.class.getName());
-    if (ALLOY.equals(name)) return new UIManager.LookAndFeelInfo(ALLOY, "com.incors.plaf.alloy.AlloyIdea");
-    if (GTK.equals(name)) return new UIManager.LookAndFeelInfo(GTK, "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-    return null;
-  }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
index b17805579869..938e9e867699 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
@@ -15,10 +15,10 @@
  */
 package com.intellij.ide.customize;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.plugins.RepositoryHelper;
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.util.Condition;
@@ -329,7 +329,7 @@ public class PluginGroups {
     else {
       myFeaturedIds.remove(pluginId);
     }
-    StartupUtil.setFeaturedPluginsToInstall(myFeaturedIds);
+    WelcomeWizardUtil.setFeaturedPluginsToInstall(myFeaturedIds);
   }
 
   void setPluginEnabledWithDependencies(final String pluginId, boolean enabled) {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index a50d2f930b17..929d03d28db0 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -18,13 +18,13 @@ package com.intellij.ide.ui.laf;
 import com.intellij.CommonBundle;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.LafManagerListener;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.laf.darcula.DarculaInstaller;
 import com.intellij.ide.ui.laf.darcula.DarculaLaf;
 import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
-import com.intellij.idea.StartupUtil;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
@@ -221,7 +221,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
       if (laf != null) {
         boolean needUninstall = UIUtil.isUnderDarcula();
         setCurrentLookAndFeel(laf); // setup default LAF or one specified by readExternal.
-        if (StartupUtil.getWizardLAF() != null) {
+        if (WelcomeWizardUtil.getWizardLAF() != null) {
           if (UIUtil.isUnderDarcula()) {
             DarculaInstaller.install();
           }
@@ -315,8 +315,8 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
    * RubyMine uses Native L&F for linux as well
    */
   private UIManager.LookAndFeelInfo getDefaultLaf() {
-    if (StartupUtil.getWizardLAF() != null) {
-      UIManager.LookAndFeelInfo laf = findLaf(StartupUtil.getWizardLAF());
+    if (WelcomeWizardUtil.getWizardLAF() != null) {
+      UIManager.LookAndFeelInfo laf = findLaf(WelcomeWizardUtil.getWizardLAF());
       LOG.assertTrue(laf != null);
       return laf;
     }
@@ -337,7 +337,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
       }
     }
     // Default
-    final String defaultLafName = StartupUtil.getDefaultLAF();
+    final String defaultLafName = WelcomeWizardUtil.getDefaultLAF();
     if (defaultLafName != null) {
       UIManager.LookAndFeelInfo defaultLaf = findLaf(defaultLafName);
       if (defaultLaf != null) {
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 10f9c7365cfe..fdf11dc54e4d 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -38,7 +38,9 @@ import javax.swing.*;
 import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * @author yole
@@ -47,46 +49,9 @@ public class StartupUtil {
   @NonNls public static final String NO_SPLASH = "nosplash";
 
   private static SocketLock ourLock;
-  private static String myDefaultLAF;
-  private static String myWizardLAF;
-  private static String myWizardMacKeymap;
-  private static Set<String> myFeaturedPluginsToInstall = new HashSet<String>();
 
   private StartupUtil() { }
 
-  public static void setDefaultLAF(String laf) {
-    myDefaultLAF = laf;
-  }
-
-  public static String getDefaultLAF() {
-    return myDefaultLAF;
-  }
-
-  public static void setWizardLAF(String myWizardLAF) {
-    StartupUtil.myWizardLAF = myWizardLAF;
-  }
-
-  public static String getWizardLAF() {
-    return myWizardLAF;
-  }
-
-  public static void setMyWizardMacKeymap(String myWizardMacKeymap) {
-    StartupUtil.myWizardMacKeymap = myWizardMacKeymap;
-  }
-
-  public static String getMyWizardMacKeymap() {
-    return myWizardMacKeymap;
-  }
-
-  public static Set<String> getMyFeaturedPluginsToInstall() {
-    return Collections.unmodifiableSet(myFeaturedPluginsToInstall);
-  }
-
-  public static void setFeaturedPluginsToInstall(Set<String> pluginsToInstall) {
-    myFeaturedPluginsToInstall.clear();
-    myFeaturedPluginsToInstall.addAll(pluginsToInstall);
-  }
-
   public static boolean shouldShowSplash(final String[] args) {
     return !Arrays.asList(args).contains(NO_SPLASH);
   }
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
index 0a70d05c708f..94a12bb944fd 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
@@ -16,6 +16,7 @@
 package com.intellij.internal.statistic.configurable;
 
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
+import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
@@ -25,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
-public class StatisticsConfigurable implements SearchableConfigurable {
+public class StatisticsConfigurable implements SearchableConfigurable, Configurable.NoScroll {
 
     private boolean modifiedByDefault;
 
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
index 5a20875acb0f..6015b65620e0 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="335" height="259"/>
+      <xy x="20" y="20" width="335" height="268"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -38,8 +38,8 @@
                   <text value=""/>
                 </properties>
               </component>
-              <grid id="d4bdc" binding="myRadioButtonPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
+              <grid id="d4bdc" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="10" right="0"/>
                 <constraints>
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="2" use-parent-layout="false"/>
                 </constraints>
@@ -75,22 +75,12 @@
               </grid>
             </children>
           </grid>
-          <grid id="edf0a" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="30" left="0" bottom="0" right="0"/>
+          <component id="67819" class="javax.swing.JLabel" binding="myLabel">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="1" 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/>
-            <border type="none"/>
-            <children>
-              <component id="67819" class="javax.swing.JLabel" binding="myLabel">
-                <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/>
-              </component>
-            </children>
-          </grid>
+          </component>
         </children>
       </grid>
       <component id="9c047" class="javax.swing.JLabel" binding="myTitle">
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
index 6aa0329a831e..15d3e63727f0 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.java
@@ -21,7 +21,7 @@ import com.intellij.internal.statistic.connect.StatisticsService;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationNamesInfo;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.ui.RelativeFont;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -37,14 +37,13 @@ public class StatisticsConfigurationComponent {
   private JRadioButton myMonthlyRadioButton;
   private JRadioButton myWeeklyRadioButton;
   private JLabel myLabel;
-  private JPanel myRadioButtonPanel;
 
   public StatisticsConfigurationComponent() {
     String product = ApplicationNamesInfo.getInstance().getFullProductName();
     String company = ApplicationInfo.getInstance().getCompanyName();
     myTitle.setText(StatisticsBundle.message("stats.title", product, company));
     myLabel.setText(StatisticsBundle.message("stats.config.details", company));
-    myLabel.setFont(UIUtil.getLabelFont(UIUtil.FontSize.SMALL));
+    RelativeFont.SMALL.install(myLabel);
 
     myAllowToSendUsagesCheckBox.setText(StatisticsBundle.message("stats.config.allow.send.stats.text", company));
     myAllowToSendUsagesCheckBox.addActionListener(new ActionListener() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index 068cb4b7e0f2..b376ad8c324d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -17,11 +17,14 @@ package com.intellij.openapi.application;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
 import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.AppUIUtil;
 import com.intellij.util.PlatformUtils;
+import com.intellij.util.ReflectionUtil;
+import com.intellij.util.SmartList;
 import com.intellij.util.ThreeState;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -30,8 +33,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.PropertyResourceBundle;
@@ -55,21 +56,25 @@ public class ConfigImportHelper {
   private ConfigImportHelper() {
   }
 
-  public static void importConfigsTo(String newConfigPath) {
+  public static void importConfigsTo(@NotNull String newConfigPath) {
     ConfigImportSettings settings = getConfigImportSettings();
 
-    File oldConfigDir = findOldConfigDir(newConfigPath, settings.getCustomPathsSelector());
+    File newConfigDir = new File(newConfigPath);
+    File oldConfigDir = findOldConfigDir(newConfigDir, settings.getCustomPathsSelector());
     do {
       ImportOldConfigsPanel dialog = new ImportOldConfigsPanel(oldConfigDir, settings);
       dialog.setModalityType(Dialog.ModalityType.TOOLKIT_MODAL);
       AppUIUtil.updateWindowIcon(dialog);
       dialog.setVisible(true);
       if (dialog.isImportEnabled()) {
-        File instHome = dialog.getSelectedFile();
-        oldConfigDir = getOldConfigDir(instHome, settings);
-        if (!validateOldConfigDir(instHome, oldConfigDir, settings)) continue;
+        File installationHome = dialog.getSelectedFile();
+        oldConfigDir = getOldConfigDir(installationHome, settings);
+        if (!validateOldConfigDir(installationHome, oldConfigDir, settings)) {
+          continue;
+        }
 
-        doImport(newConfigPath, oldConfigDir);
+        assert oldConfigDir != null;
+        doImport(newConfigDir, oldConfigDir);
         settings.importFinished(newConfigPath);
         System.setProperty(CONFIG_IMPORTED_IN_CURRENT_SESSION_KEY, Boolean.TRUE.toString());
       }
@@ -79,38 +84,30 @@ public class ConfigImportHelper {
     while (true);
   }
 
+  @NotNull
   private static ConfigImportSettings getConfigImportSettings() {
     try {
-      Class customProviderClass =
-        Class.forName("com.intellij.openapi.application." + PlatformUtils.getPlatformPrefix() + "ConfigImportSettings");
-      if (customProviderClass != null) {
-        if (ConfigImportSettings.class.isAssignableFrom(customProviderClass)) {
-          Constructor constructor = customProviderClass.getDeclaredConstructor();
-          if (constructor != null) {
-            return (ConfigImportSettings)constructor.newInstance();
-          }
-        }
+      @SuppressWarnings("unchecked")
+      Class<ConfigImportSettings> customProviderClass =
+        (Class<ConfigImportSettings>)Class.forName("com.intellij.openapi.application." + PlatformUtils.getPlatformPrefix() + "ConfigImportSettings");
+      if (ConfigImportSettings.class.isAssignableFrom(customProviderClass)) {
+        return ReflectionUtil.newInstance(customProviderClass);
       }
     }
     catch (ClassNotFoundException ignored) {
     }
-    catch (NoSuchMethodException ignored) {
-    }
-    catch (InvocationTargetException ignored) {
-    }
-    catch (InstantiationException ignored) {
-    }
-    catch (IllegalAccessException ignored) {
+    catch (RuntimeException ignored) {
     }
     return new ConfigImportSettings();
   }
 
   @Nullable
-  private static File findOldConfigDir(String newConfigPath, @Nullable String customPathSelector) {
-    final File configDir = new File(newConfigPath);
-    final File selectorDir = CONFIG_RELATED_PATH.length() == 0 ? configDir : configDir.getParentFile();
+  private static File findOldConfigDir(@NotNull File configDir, @Nullable String customPathSelector) {
+    final File selectorDir = CONFIG_RELATED_PATH.isEmpty() ? configDir : configDir.getParentFile();
     final File parent = selectorDir.getParentFile();
-    if (parent == null || !parent.exists()) return null;
+    if (parent == null || !parent.exists()) {
+      return null;
+    }
     File maxFile = null;
     long lastModified = 0;
     final String selector = PathManager.getPathsSelector() != null ? PathManager.getPathsSelector() : selectorDir.getName();
@@ -119,14 +116,17 @@ public class ConfigImportHelper {
     final String customPrefix = customPathSelector != null ? getPrefixFromSelector(customPathSelector) : null;
     for (File file : parent.listFiles(new FilenameFilter() {
       @Override
-      public boolean accept(File file, String name) {
+      public boolean accept(@NotNull File file, @NotNull String name) {
         return StringUtil.startsWithIgnoreCase(name, prefix) ||
                customPrefix != null && StringUtil.startsWithIgnoreCase(name, customPrefix);
       }
     })) {
-      final File options = new File(file, CONFIG_RELATED_PATH + OPTIONS_XML);
-      if (!options.exists()) continue;
-      final long modified = options.lastModified();
+      File options = new File(file, CONFIG_RELATED_PATH + OPTIONS_XML);
+      if (!options.exists()) {
+        continue;
+      }
+
+      long modified = options.lastModified();
       if (modified > lastModified) {
         lastModified = modified;
         maxFile = file;
@@ -139,9 +139,9 @@ public class ConfigImportHelper {
     return (SystemInfo.isMac ? "" : ".") + selector.replaceAll("\\d", "");
   }
 
-  public static void doImport(final String newConfigPath, final File oldConfigDir) {
+  private static void doImport(@NotNull File newConfigDir, @NotNull File oldConfigDir) {
     try {
-      xcopy(oldConfigDir, new File(newConfigPath));
+      copy(oldConfigDir, newConfigDir);
     }
     catch (IOException e) {
       JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
@@ -150,14 +150,12 @@ public class ConfigImportHelper {
     }
   }
 
-  public static boolean validateOldConfigDir(final File instHome, final File oldConfigDir, ConfigImportSettings settings) {
+  private static boolean validateOldConfigDir(@Nullable File installationHome, @Nullable File oldConfigDir, @NotNull ConfigImportSettings settings) {
     if (oldConfigDir == null) {
-      final String message = !instHome.equals(oldConfigDir) ?
-                             ApplicationBundle.message("error.invalid.installation.home", instHome.getAbsolutePath(),
-                                                       settings.getProductName(ThreeState.YES)) :
-                             ApplicationBundle.message("error.invalid.config.folder", instHome.getAbsolutePath(),
-                                                       settings.getProductName(ThreeState.YES));
-      JOptionPane.showMessageDialog(JOptionPane.getRootFrame(), message);
+      if (installationHome != null) {
+        JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
+                                      ApplicationBundle.message("error.invalid.installation.home", installationHome.getAbsolutePath(), settings.getProductName(ThreeState.YES)));
+      }
       return false;
     }
 
@@ -171,7 +169,7 @@ public class ConfigImportHelper {
     return true;
   }
 
-  public static void xcopy(File src, File dest) throws IOException {
+  private static void copy(@NotNull File src, @NotNull File dest) throws IOException {
     src = src.getCanonicalFile();
     dest = dest.getCanonicalFile();
     if (!src.isDirectory()) {
@@ -184,32 +182,53 @@ public class ConfigImportHelper {
       return;
     }
 
-    FileUtil.copyDir(src, dest);
+    FileUtil.ensureExists(dest);
 
-    // Delete plugins just imported. They're most probably incompatible with newer idea version.
-    File plugins = new File(dest, PLUGINS_PATH);
+    File[] childFiles = src.listFiles(new FilenameFilter() {
+      @Override
+      public boolean accept(@NotNull File dir, @NotNull String name) {
+        // Don't copy plugins just imported. They're most probably incompatible with newer idea version.
+        return !StringUtil.startsWithChar(name, '.') && !name.equals(PLUGINS_PATH);
+      }
+    });
+
+    if (childFiles == null || childFiles.length == 0) {
+      return;
+    }
+
+    for (File from : childFiles) {
+      File to = new File(dest, from.getName());
+      if (from.isDirectory()) {
+        FileUtil.copyDir(from, to, false);
+      }
+      else {
+        FileUtil.copy(from, to);
+      }
+    }
+
+    File plugins = new File(src, PLUGINS_PATH);
     if (plugins.exists()) {
-      final ArrayList<IdeaPluginDescriptorImpl> descriptors = new ArrayList<IdeaPluginDescriptorImpl>();
-      PluginManager.loadDescriptors(plugins.getPath(), descriptors, null, 0);
-      final ArrayList<String> oldPlugins = new ArrayList<String>();
+      List<IdeaPluginDescriptorImpl> descriptors = new SmartList<IdeaPluginDescriptorImpl>();
+      PluginManagerCore.loadDescriptors(plugins, descriptors, null, 0);
+      List<String> oldPlugins = new SmartList<String>();
       for (IdeaPluginDescriptorImpl descriptor : descriptors) {
-        oldPlugins.add(descriptor.getPluginId().getIdString());
+        // check isBundled also - probably plugin is bundled in new IDE version
+        if (descriptor.isEnabled() && !descriptor.isBundled()) {
+          oldPlugins.add(descriptor.getPluginId().getIdString());
+        }
       }
       if (!oldPlugins.isEmpty()) {
-        PluginManager.savePluginsList(oldPlugins, false, new File(dest, PluginManager.INSTALLED_TXT));
+        PluginManagerCore.savePluginsList(oldPlugins, false, new File(dest, PluginManager.INSTALLED_TXT));
       }
-      FileUtil.delete(plugins);
-    }
-    
-    File pluginsSettings = new File(new File(dest, "options"), "plugin_ui.xml");
-    if (pluginsSettings.exists()) {
-      FileUtil.delete(pluginsSettings);
     }
   }
 
   @Nullable
-  public static File getOldConfigDir(File oldInstallHome, ConfigImportSettings settings) {
-    if (oldInstallHome == null) return null;
+  public static File getOldConfigDir(@Nullable File oldInstallHome, ConfigImportSettings settings) {
+    if (oldInstallHome == null) {
+      return null;
+    }
+
     // check if it's already config dir
     if (new File(oldInstallHome, OPTIONS_XML).exists()) {
       return oldInstallHome;
@@ -299,8 +318,8 @@ public class ConfigImportHelper {
                                               @NotNull final String propertyName) {
     if (file.getName().endsWith(".properties")) {
       try {
-        InputStream fis = new BufferedInputStream(new FileInputStream(file));
         PropertyResourceBundle bundle;
+        InputStream fis = new BufferedInputStream(new FileInputStream(file));
         try {
           bundle = new PropertyResourceBundle(fis);
         }
@@ -374,7 +393,7 @@ public class ConfigImportHelper {
   @Nullable
   private static String getContent(File file) {
     try {
-      StringBuffer content = new StringBuffer();
+      StringBuilder content = new StringBuilder();
       BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
       try {
         do {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
index 0d0377bdf7fe..7f83539afc5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
@@ -19,6 +19,7 @@
  */
 package com.intellij.openapi.editor.colors.impl;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
@@ -89,7 +90,14 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
 
     loadAdditionalTextAttributes();
 
-    setGlobalSchemeInner(myDefaultColorSchemesManager.getAllSchemes()[0]);
+    String wizardEditorScheme = WelcomeWizardUtil.getWizardEditorScheme();
+    EditorColorsScheme scheme = null;
+    if (wizardEditorScheme != null) {
+      scheme = getScheme(wizardEditorScheme);
+      LOG.assertTrue(scheme != null, "Wizard scheme " + wizardEditorScheme + " not found");
+    }
+    if (scheme == null) scheme = myDefaultColorSchemesManager.getAllSchemes()[0]; 
+    setGlobalSchemeInner(scheme);
   }
 
   private static boolean isUnitTestOrHeadlessMode() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
index 37e9dc583628..1891e59711bd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
@@ -358,8 +358,10 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
     for (final StandardFileType pair : myStandardFileTypes.values()) {
       registerFileTypeWithoutNotification(pair.fileType, pair.matchers);
     }
-    for (StandardFileType pair : myStandardFileTypes.values()) {
-      registerReDetectedMappings(pair);
+    if (!myUnresolvedMappings.isEmpty()) {
+      for (StandardFileType pair : myStandardFileTypes.values()) {
+        registerReDetectedMappings(pair);
+      }
     }
     // Resolve unresolved mappings initialized before certain plugin initialized.
     for (final StandardFileType pair : myStandardFileTypes.values()) {
@@ -1297,14 +1299,23 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
     FileType fileType = pair.fileType;
     if (fileType == PlainTextFileType.INSTANCE) return;
     for (FileNameMatcher matcher : pair.matchers) {
-      String typeName = myUnresolvedMappings.get(matcher);
-      if (typeName != null && !typeName.equals(fileType.getName())) {
-        Trinity<String, String, Boolean> trinity = myUnresolvedRemovedMappings.get(matcher);
-        myRemovedMappings.put(matcher, Pair.create(fileType, trinity != null && trinity.third));
+      registerReDetectedMapping(fileType, matcher);
+      if (matcher instanceof ExtensionFileNameMatcher) {
+        // also check exact file name matcher
+        ExtensionFileNameMatcher extMatcher = (ExtensionFileNameMatcher)matcher;
+        registerReDetectedMapping(fileType, new ExactFileNameMatcher("." + extMatcher.getExtension()));
       }
     }
   }
 
+  private void registerReDetectedMapping(@NotNull FileType fileType, @NotNull FileNameMatcher matcher) {
+    String typeName = myUnresolvedMappings.get(matcher);
+    if (typeName != null && !typeName.equals(fileType.getName())) {
+      Trinity<String, String, Boolean> trinity = myUnresolvedRemovedMappings.get(matcher);
+      myRemovedMappings.put(matcher, Pair.create(fileType, trinity != null && trinity.third));
+    }
+  }
+
   Map<FileNameMatcher, Pair<FileType, Boolean>> getRemovedMappings() {
     return myRemovedMappings;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
index ce1bcbe3c64e..f1ecd44b3fa1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.keymap.impl;
 
-import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
@@ -87,7 +86,7 @@ public class DefaultKeymap {
 
   public String getDefaultKeymapName() {
     if (SystemInfo.isMac) {
-      return StartupUtil.getMyWizardMacKeymap() != null ? StartupUtil.getMyWizardMacKeymap() : KeymapManager.MAC_OS_X_KEYMAP;
+      return KeymapManager.MAC_OS_X_KEYMAP;
     }
     else if (SystemInfo.isXWindow) {
       return KeymapManager.X_WINDOW_KEYMAP;
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
index b64d0b0362e2..580537c7b8ba 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.keymap.impl;
 
+import com.intellij.ide.WelcomeWizardUtil;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.keymap.Keymap;
@@ -75,7 +76,9 @@ public class KeymapManagerImpl extends KeymapManagerEx implements PersistentStat
                                                     RoamingType.PER_USER);
 
     Keymap[] keymaps = defaultKeymap.getKeymaps();
-    String systemDefaultKeymap = defaultKeymap.getDefaultKeymapName();
+    String systemDefaultKeymap = WelcomeWizardUtil.getWizardMacKeymap() != null
+                                 ? WelcomeWizardUtil.getWizardMacKeymap()
+                                 : defaultKeymap.getDefaultKeymapName();
     for (Keymap keymap : keymaps) {
       addKeymap(keymap);
       if (systemDefaultKeymap.equals(keymap.getName())) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
index fdd4fa96aaee..0818cb6d176f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsFilter.java
@@ -20,6 +20,7 @@ import com.intellij.ide.ui.search.SearchableOptionsRegistrar;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableGroup;
 import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.openapi.options.ex.ConfigurableWrapper;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -208,10 +209,7 @@ abstract class SettingsFilter extends ElementFilter.Active.Impl<SimpleNode> {
   }
 
   private static boolean isEmptyParent(Configurable configurable) {
-    if (configurable instanceof SearchableConfigurable.Parent) {
-      SearchableConfigurable.Parent parent = (SearchableConfigurable.Parent)configurable;
-      return !parent.hasOwnContent();
-    }
-    return false;
+    SearchableConfigurable.Parent parent = ConfigurableWrapper.cast(SearchableConfigurable.Parent.class, configurable);
+    return parent != null && !parent.hasOwnContent();
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
index 81b51cab9cb2..bfa477159ef1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,17 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.impl.welcomeScreen.FlatWelcomeFrameProvider;
 
 public class CheckForUpdateAction extends AnAction implements DumbAware {
   @Override
   public void update(AnActionEvent e) {
-    e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(e.getPlace()));
+    final String place = e.getPlace();
+    if (ActionPlaces.WELCOME_SCREEN.equals(place) && FlatWelcomeFrameProvider.isAvailable()) {
+      e.getPresentation().setEnabledAndVisible(true);
+    } else {
+      e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(place));
+    }
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
index 56ae855dc317..2a576abf538a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,17 @@ public class Product {
   private final Set<String> myCodes;
   private final List<UpdateChannel> myChannels;
 
-  public Product(Element node) {
+  public Product(@NotNull Element node) {
     myName = node.getAttributeValue("name");
     myCodes = new LinkedHashSet<String>();
     myChannels = new ArrayList<UpdateChannel>();
 
-    List codes = node.getChildren("code");
-    for (Object code : codes) {
-      myCodes.add(((Element)code).getValue());
+    for (Element code : node.getChildren("code")) {
+      myCodes.add(code.getValue());
     }
 
-    List channels = node.getChildren("channel");
-    for (Object channel : channels) {
-      myChannels.add(new UpdateChannel((Element)channel));
+    for (Element channel : node.getChildren("channel")) {
+      myChannels.add(new UpdateChannel(channel));
     }
   }
 
@@ -56,7 +54,9 @@ public class Product {
   @Nullable
   public UpdateChannel findUpdateChannelById(String id) {
     for (UpdateChannel channel : myChannels) {
-      if (id.equals(channel.getId())) return channel;
+      if (id.equals(channel.getId())) {
+        return channel;
+      }
     }
     return null;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
index 3a3869146e94..4d986b4a3cc2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 package com.intellij.openapi.updateSettings.impl;
 
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -39,12 +40,11 @@ public class UpdateChannel {
   public static final String LICENSING_EAP = "eap";
   public static final String LICENSING_PRODUCTION = "production";
 
-  public UpdateChannel(Element node) {
+  public UpdateChannel(@NotNull Element node) {
     myId = node.getAttributeValue("id");
     myName = node.getAttributeValue("name");
     myStatus = ChannelStatus.fromCode(node.getAttributeValue("status"));
-    String licensing = node.getAttributeValue("licensing");
-    myLicensing = licensing != null ? licensing : LICENSING_PRODUCTION;
+    myLicensing = node.getAttributeValue("licensing", LICENSING_PRODUCTION);
 
     String majorVersion = node.getAttributeValue("majorVersion");
     myMajorVersion = majorVersion != null ? Integer.parseInt(majorVersion) : -1;
@@ -56,8 +56,8 @@ public class UpdateChannel {
     myFeedbackUrl = node.getAttributeValue("feedback");
 
     myBuilds = new ArrayList<BuildInfo>();
-    for (Object child : node.getChildren("build")) {
-      myBuilds.add(new BuildInfo((Element)child));
+    for (Element child : node.getChildren("build")) {
+      myBuilds.add(new BuildInfo(child));
     }
   }
 
@@ -69,7 +69,6 @@ public class UpdateChannel {
         build = info;
       }
     }
-
     return build;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 6e879427859a..a846fd4fe87d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -93,7 +93,7 @@ public final class UpdateChecker {
   @NonNls private static final String DISABLED_UPDATE = "disabled_update.txt";
 
   private static Set<String> ourDisabledToUpdatePlugins;
-  private static Map<String, String> ourAdditionalRequestOptions = new HashMap<String, String>();
+  private static final Map<String, String> ourAdditionalRequestOptions = new HashMap<String, String>();
 
   private static class Holder {
     private static final String UPDATE_URL = ApplicationInfoEx.getInstanceEx().getUpdateUrls().getCheckingUrl();
@@ -464,8 +464,7 @@ public final class UpdateChecker {
   private static CheckForUpdateResult checkForUpdates(final UpdateSettings settings) {
     UpdatesInfo info;
     try {
-      UpdatesXmlLoader loader = new UpdatesXmlLoader(getUpdateUrl());
-      info = loader.loadUpdatesInfo();
+      info = UpdatesXmlLoader.loadUpdatesInfo(getUpdateUrl());
       if (info == null) {
         return new CheckForUpdateResult(UpdateStrategy.State.NOTHING_LOADED);
       }
@@ -660,14 +659,12 @@ public final class UpdateChecker {
         return uid;
       }
     }
-    String uid;
-    if (!propertiesComponent.isValueSet(INSTALLATION_UID)) {
+
+    String uid = propertiesComponent.getValue(INSTALLATION_UID);
+    if (uid == null) {
       uid = generateUUID();
       propertiesComponent.setValue(INSTALLATION_UID, uid);
     }
-    else {
-      uid = propertiesComponent.getValue(INSTALLATION_UID);
-    }
     return uid;
   }
 
@@ -683,11 +680,8 @@ public final class UpdateChecker {
             return FileUtil.loadFile(permanentIdFile).trim();
           }
 
-          String uuid;
-          if (propertiesComponent.isValueSet(INSTALLATION_UID)) {
-            uuid = propertiesComponent.getValue(INSTALLATION_UID);
-          }
-          else {
+          String uuid = propertiesComponent.getValue(INSTALLATION_UID);
+          if (uuid == null) {
             uuid = generateUUID();
           }
           FileUtil.writeToFile(permanentIdFile, uuid);
@@ -764,7 +758,11 @@ public final class UpdateChecker {
 
     String fromBuildNumber = patch.getFromBuild().asStringWithoutProductCode();
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();
-    String bundledJdk = "jdk-bundled".equals(System.getProperty("idea.java.redist")) ? "-jdk-bundled" : "";
+    String jdkMacRedist = System.getProperty("idea.java.redist");
+    String bundledJdk = "";
+    if (jdkMacRedist != null && jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
+      bundledJdk = "jdk-bundled".equals(jdkMacRedist) ? "-jdk-bundled" : "-custom-jdk-bundled";
+    }
 
     String fileName = productCode + "-" + fromBuildNumber + "-" + toBuildNumber + "-patch" + bundledJdk + osSuffix + ".jar";
 
@@ -812,7 +810,7 @@ public final class UpdateChecker {
       out.close();
     }
 
-    String patchFileName = ("jetbrains.patch.jar." + platform).toLowerCase();
+    String patchFileName = ("jetbrains.patch.jar." + platform).toLowerCase(Locale.ENGLISH);
     File patchFile = new File(FileUtil.getTempDirectory(), patchFileName);
     FileUtil.copy(tempFile, patchFile);
     FileUtil.delete(tempFile);
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
index 46bd1182db61..0e2d93753958 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.updateSettings.impl;
 
-
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,11 +25,10 @@ import java.util.List;
 public class UpdatesInfo {
   @NotNull private final List<Product> myProducts;
 
-  public UpdatesInfo(Element element) {
+  public UpdatesInfo(@NotNull Element element) {
     myProducts = new ArrayList<Product>();
-    List children = element.getChildren();
-    for (Object child : children) {
-      myProducts.add(new Product((Element) child));
+    for (Element child : element.getChildren()) {
+      myProducts.add(new Product(child));
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
index 35f47c9eb6de..dd37637ea671 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable.UpdatesSettingsPanel">
-  <grid id="5aa87" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="5aa87" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="62" y="37" width="816" height="434"/>
@@ -8,18 +8,10 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="fd85b" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="messages/IdeBundle" key="updates.settings.caption.1"/>
-        </properties>
-      </component>
       <grid id="e409a" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="0" bottom="20" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -83,7 +75,7 @@
       </component>
       <component id="db163" class="javax.swing.JLabel">
         <constraints>
-          <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"/>
+          <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="messages/IdeBundle" key="updates.settings.last.check"/>
@@ -91,7 +83,7 @@
       </component>
       <component id="6b5cb" class="javax.swing.JLabel" binding="myLastCheckedDate">
         <constraints>
-          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="01.05.2005"/>
@@ -99,12 +91,12 @@
       </component>
       <hspacer id="fdc69">
         <constraints>
-          <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
       <vspacer id="3d6db">
         <constraints>
-          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
     </children>
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
index 9c6c6a2020e5..f8f9a71c120c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,33 +25,19 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.net.HttpConfigurable;
 import org.jdom.JDOMException;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class UpdatesXmlLoader {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.updateSettings.impl.UpdatesXmlLoader");
-
-  private final String updateUrl;
-
-  public UpdatesXmlLoader(final String updatesUrl) {
-    this.updateUrl = updatesUrl;
-  }
+import java.util.concurrent.*;
 
+class UpdatesXmlLoader {
+  private static final Logger LOG = Logger.getInstance(UpdatesXmlLoader.class);
 
   @Nullable
-  public UpdatesInfo loadUpdatesInfo() throws ConnectionException{
-    LOG.debug("load update xml (UPDATE_URL='" + updateUrl + "' )");
+  public static UpdatesInfo loadUpdatesInfo(@Nullable final String updateUrl) throws ConnectionException {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("load update xml (UPDATE_URL='" + updateUrl + "' )");
+    }
 
     if (StringUtil.isEmpty(updateUrl)) {
       LOG.debug("update url is empty: updates will not be checked");
@@ -59,20 +45,13 @@ public class UpdatesXmlLoader {
     }
 
     final Ref<Exception> error = new Ref<Exception>();
-    FutureTask<UpdatesInfo> ft = new FutureTask<UpdatesInfo>(new Callable<UpdatesInfo>() {
+    Future<UpdatesInfo> future = ApplicationManager.getApplication().executeOnPooledThread(new Callable<UpdatesInfo>() {
       @Nullable
       @Override
       public UpdatesInfo call() throws Exception {
         try {
-          prepareUrl(updateUrl);
-
-          URL requestUrl = prepareRequestUrl(updateUrl);
-
-          URLConnection connection = requestUrl.openConnection();
-          connection.setConnectTimeout(HttpConfigurable.CONNECTION_TIMEOUT);
-          connection.setReadTimeout(HttpConfigurable.CONNECTION_TIMEOUT);
-          final InputStream inputStream = connection.getInputStream();
-          Reader reader = new InputStreamReader(inputStream);
+          String url = updateUrl.startsWith("file:") ? updateUrl : updateUrl + '?' + UpdateChecker.prepareUpdateCheckArgs();
+          InputStream inputStream = HttpConfigurable.getInstance().openConnection(url).getInputStream();
           try {
             return new UpdatesInfo(JDOMUtil.loadDocument(inputStream).getRootElement());
           }
@@ -80,59 +59,41 @@ public class UpdatesXmlLoader {
             LOG.info(e); // Broken xml downloaded. Don't bother telling user.
           }
           finally {
-            reader.close();
             inputStream.close();
           }
         }
         catch (Exception e) {
+          LOG.debug(e);
           error.set(e);
         }
         return null;
       }
     });
-    ApplicationManager.getApplication().executeOnPooledThread(ft);
+
+    UpdatesInfo result = null;
     try {
-      UpdatesInfo result = ft.get(5, TimeUnit.SECONDS);
-      if (!error.isNull()) {
-        //noinspection ThrowableResultOfMethodCallIgnored
-        throw new ConnectionException(error.get());
-      }
-      return result;
+      result = future.get(5, TimeUnit.SECONDS);
     }
-    catch (TimeoutException e) {
-      // ignore
+    catch (TimeoutException ignored) {
     }
-    catch (Exception e) {
+    catch (InterruptedException e) {
       LOG.debug(e);
-      throw new ConnectionException(e.getMessage(),e);
+      error.set(e);
     }
-    if (!ft.isDone()) {
-      ft.cancel(true);
-      throw new ConnectionException(IdeBundle.message("updates.timeout.error"));
+    catch (ExecutionException e) {
+      LOG.debug(e);
+      error.set(e);
     }
-    return null;
 
-  }
-
-
-  protected static void prepareUrl(@NotNull String url) throws ConnectionException {
-    try {
-      HttpConfigurable.getInstance().prepareURL(url);
-    }
-    catch (Exception e) {
-      throw new ConnectionException(e);
-    }
-  }
-
-  protected URL prepareRequestUrl(@NotNull String url) throws ConnectionException {
-    try {
-      if (url.startsWith("file:")) {
-        return new URL(url);
+    if (!future.isDone()) {
+      future.cancel(true);
+      if (error.isNull()) {
+        throw new ConnectionException(IdeBundle.message("updates.timeout.error"));
       }
-      return new URL(url + "?" + UpdateChecker.prepareUpdateCheckArgs());
     }
-    catch (Exception e) {
-      throw new ConnectionException(e);
+    if (!error.isNull()) {
+      throw new ConnectionException(error.get());
     }
+    return result;
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
index 4ae3caee88e1..b08adda9d2f9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
@@ -245,6 +245,7 @@ public class PluginsAdvertiser implements StartupActivity {
     final KnownExtensions extensions = loadExtensions();
     if (extensions != null && unknownFeatures.isEmpty()) return;
     final Runnable runnable = new Runnable() {
+      @Override
       public void run() {
         final Application application = ApplicationManager.getApplication();
         if (application.isUnitTestMode() || application.isHeadlessEnvironment()) return;
@@ -252,9 +253,10 @@ public class PluginsAdvertiser implements StartupActivity {
           private final Set<PluginDownloader> myPlugins = new HashSet<PluginDownloader>();
           private List<IdeaPluginDescriptor> myAllPlugins;
 
-          private Map<Plugin, IdeaPluginDescriptor> myDisabledPlugins = new HashMap<Plugin, IdeaPluginDescriptor>();
+          private final Map<Plugin, IdeaPluginDescriptor> myDisabledPlugins = new HashMap<Plugin, IdeaPluginDescriptor>();
           private List<String> myBundledPlugin;
 
+          @Override
           public void run() {
             try {
               myAllPlugins = RepositoryHelper.loadPluginsFromRepository(null);
@@ -349,6 +351,7 @@ public class PluginsAdvertiser implements StartupActivity {
     @MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false)
     public Map<String, PluginSet> myExtensions = new HashMap<String, PluginSet>();
 
+    @SuppressWarnings("unused")
     public KnownExtensions() {
     }
 
@@ -371,6 +374,7 @@ public class PluginsAdvertiser implements StartupActivity {
   public static class PluginSet {
     public Set<Plugin> myPlugins = new HashSet<Plugin>();
 
+    @SuppressWarnings("unused")
     public PluginSet() {
     }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 564206931b40..b93a024a1660 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -294,8 +294,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
         public void actionPerformed(@NotNull AnActionEvent e) {
           ActionGroup configureGroup = (ActionGroup)ActionManager.getInstance().getAction(groupId);
           final PopupFactoryImpl.ActionGroupPopup popup = (PopupFactoryImpl.ActionGroupPopup)JBPopupFactory.getInstance()
-            .createActionGroupPopup(null, new IconsFreeActionGroup(configureGroup), e.getDataContext(), false, false, false, null,
-                                    10, null);
+            .createActionGroupPopup(null, new IconsFreeActionGroup(configureGroup), e.getDataContext(), JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false, ActionPlaces.WELCOME_SCREEN);
           popup.showUnderneathOfLabel(ref.get());
         }
       };
@@ -312,6 +311,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
 
     private JComponent createActionPanel() {
       JPanel actions = new NonOpaquePanel();
+      actions.setBorder(new EmptyBorder(0, 10, 0, 0));
       actions.setLayout(new BoxLayout(actions, BoxLayout.Y_AXIS));
       ActionManager actionManager = ActionManager.getInstance();
       ActionGroup quickStart = (ActionGroup)actionManager.getAction(IdeActions.GROUP_WELCOME_SCREEN_QUICKSTART);
@@ -509,9 +509,15 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame {
       private final ActionGroup myGroup;
 
       public IconsFreeActionGroup(ActionGroup group) {
+        super(group.getTemplatePresentation().getText(), group.getTemplatePresentation().getDescription(), null);
         myGroup = group;
       }
 
+      @Override
+      public boolean isPopup() {
+        return myGroup.isPopup();
+      }
+
       @NotNull
       @Override
       public AnAction[] getChildren(@Nullable AnActionEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
index 0679762b3f46..6bf6c07a4e2b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrameProvider.java
@@ -26,10 +26,11 @@ import com.intellij.util.PlatformUtils;
 public class FlatWelcomeFrameProvider implements WelcomeFrameProvider {
   @Override
   public IdeFrame createFrame() {
-    if (Registry.is("ide.new.welcome.screen") 
-        && (PlatformUtils.isIntelliJ() || PlatformUtils.isCidr())) {
-      return new FlatWelcomeFrame();
-    }
-    return null;
+    return isAvailable() ? new FlatWelcomeFrame() : null;
+  }
+
+  public static boolean isAvailable() {
+    return Registry.is("ide.new.welcome.screen")
+            && (PlatformUtils.isIntelliJ() || PlatformUtils.isCidr());
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
index 0d7fccb29982..fb1fc55c32ae 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewRecentProjectPanel.java
@@ -94,6 +94,15 @@ public class NewRecentProjectPanel extends RecentProjectPanel {
       protected Color getListForeground(boolean isSelected, boolean hasFocus) {
         return UIUtil.getListForeground(isSelected && hasFocus);
       }
+
+      @Override
+      protected void layoutComponents() {
+        setLayout(new BorderLayout());
+        myName.setBorder(new EmptyBorder(6, 5, 1, 5));
+        myPath.setBorder(new EmptyBorder(1, 5, 6, 5));
+        add(myName, BorderLayout.NORTH);
+        add(myPath, BorderLayout.SOUTH);
+      }
     };
   }
   
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
index 2994fede233a..ff94a4d5391f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/NewWelcomeScreen.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.updateSettings.impl.UpdateChecker;
 import com.intellij.openapi.updateSettings.impl.UpdateSettings;
 import com.intellij.openapi.util.DimensionService;
 import com.intellij.openapi.util.IconLoader;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.wm.WelcomeScreen;
 import com.intellij.ui.ScreenUtil;
 import com.intellij.ui.components.labels.LinkLabel;
@@ -150,7 +149,7 @@ public class NewWelcomeScreen extends JPanel implements WelcomeScreen {
   }
   
   public static boolean isNewWelcomeScreen(@NotNull AnActionEvent e) {
-    return e.getPlace() == ActionPlaces.WELCOME_SCREEN && Registry.is("ide.new.welcome.screen");
+    return e.getPlace() == ActionPlaces.WELCOME_SCREEN && FlatWelcomeFrameProvider.isAvailable();
   }
 
   private static class WelcomeScreenGroup extends DefaultActionGroup {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
index f47c53330771..df299567505b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.VerticalFlowLayout;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.UniqueNameBuilder;
 import com.intellij.openapi.util.text.StringUtil;
@@ -239,12 +240,16 @@ public class RecentProjectPanel extends JPanel {
     protected RecentProjectItemRenderer(UniqueNameBuilder<ReopenProjectAction> pathShortener) {
       super(new VerticalFlowLayout());
       myShortener = pathShortener;
+      myPath.setFont(myPath.getFont().deriveFont(SystemInfo.isMac ? 10f : 11f));
       setFocusable(true);
-      myPath.setFont(myPath.getFont().deriveFont((float)10));
+      layoutComponents();
+    }
+
+    protected void layoutComponents() {
       add(myName);
       add(myPath);
     }
-    
+
     protected Color getListBackground(boolean isSelected, boolean hasFocus) {
       return UIUtil.getListBackground(isSelected);
     }
diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
index 488c52d14207..bd2d7bc4a623 100644
--- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
+++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
@@ -442,6 +442,7 @@ public class SwingHelper {
       textPane.setOpaque(false);
     }
     textPane.setForeground(foreground != null ? foreground : UIUtil.getLabelForeground());
+    textPane.setFocusable(false);
     return textPane;
   }
 
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 6162300942a0..7d6fb1099492 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -1,5 +1,4 @@
 error.invalid.installation.home=Unable to import settings. ''{0}'' doesn''t appear to be valid {1} installation home.
-error.invalid.config.folder=Unable to import settings. ''{0}'' doesn''t appear to be valid {1} config folder.
 error.no.settings.path=Unable to import settings. {0} does not exist.
 title.settings.import.failed=Settings Import Failed
 error.unable.to.import.settings=Unable to import settings. {0}
@@ -46,6 +45,7 @@ editbox.blanklines.around.method=Around method:
 editbox.blanklines.before.method.body=Before method body:
 editbox.blanklines.after.class.header=After class header:
 editbox.blanklines.after.anonymous.class.header=After anonymous class header:
+editbox.blanklines.around.initializer=Around initializer:
 title.blank.lines=Blank Lines
 title.keep.blank.lines=Keep Maximum Blank Lines
 title.minimum.blank.lines=Minimum Blank Lines
diff --git a/platform/platform-resources-en/src/messages/CommonBundle.properties b/platform/platform-resources-en/src/messages/CommonBundle.properties
index 1fbbd0a61f57..a8f41d9f5cf0 100644
--- a/platform/platform-resources-en/src/messages/CommonBundle.properties
+++ b/platform/platform-resources-en/src/messages/CommonBundle.properties
@@ -159,16 +159,16 @@ safe.write.rename.backup=Cannot save {0}.\nThe file was renamed to {1}.\nYour ch
 safe.write.drop.temp=Cannot delete temporary file {0}.
 
 vfs.broken.link=Broken link
-label.system.proxy.used=You have JVM property 'java.net.useSystemProxies' set to true.\n\
-This will cause some network calls to go through operating system-defined proxy.\n\
+label.system.proxy.used=<html>You have JVM property 'java.net.useSystemProxies' set to true.<br>\
+This will cause some network calls to go through operating system-defined proxy.<br>\
 If you didn't intend to use system-defined proxy, disable this property
 http.noproxy=No proxy
 http.proxy.type=HTTP
 socks.proxy.type=SOCKS
 autodetected.proxies.clear.button=Clear passwords
-label.old.way.jvm.property.used=You have JVM property \"{0}\" set to \"{1}\".\n\
-This may lead to incorrect behaviour. Proxy should be set in Settings | HTTP Proxy\n\
-This JVM property is old and its usage is not recommended by Oracle.\n\
-\n(Note: It could have been assigned by some code dynamically.)
+label.old.way.jvm.property.used=<html>You have JVM property \"{0}\" set to \"{1}\".<br>\
+This may lead to incorrect behaviour. Proxy should be set in Settings | HTTP Proxy<br>\
+This JVM property is old and its usage is not recommended by Oracle.<br>\
+(Note: It could have been assigned by some code dynamically.)
 label.proxy.exceptions.text=Example\: *.domain.com, 192.168.*
 checkbox.automatic.proxy.configuration.url=Automatic proxy configuration URL\:
\ No newline at end of file
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 8dbf428793f1..ee5f49e1fb53 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -923,13 +923,11 @@ updates.version.info={0} (build {1})
 updates.write.protected={0} does not have write access to {1}. Please run it by a privileged user to update.
 updates.settings.title=Updates
 updates.last.check.never=Never
-updates.settings.caption.1=<html>$FULLNAME$ can automatically check for new and updated versions of itself, \
-  using your internet connection (when active).<html>
 updates.settings.check.now.button=&Check Now
-updates.settings.checkbox=Check for updates in channel
-updates.settings.build.number=     Build number:
-updates.settings.current.version=Current version\:
-updates.settings.last.check=Last checked for updates:
+updates.settings.checkbox=Automatically check updates for
+updates.settings.build.number=Build number:
+updates.settings.current.version=Current version:
+updates.settings.last.check=Last checked:
 
 hierarchy.method.next.occurence.name=Go to next method
 hierarchy.method.prev.occurence.name=Go to previous method
diff --git a/platform/platform-resources-en/src/messages/StatisticsBundle.properties b/platform/platform-resources-en/src/messages/StatisticsBundle.properties
index e7705d703990..3f37e06b648d 100644
--- a/platform/platform-resources-en/src/messages/StatisticsBundle.properties
+++ b/platform/platform-resources-en/src/messages/StatisticsBundle.properties
@@ -1,4 +1,7 @@
-stats.title=Help improve {0} by sending anonymous usage statistics to {1}
+stats.title=<html>Help improve {0} by sending anonymous usage statistics to {1}
 
 stats.config.allow.send.stats.text=Allow sending usage statistics to {0}
-stats.config.details=<html>We are asking your permission to send information about your plugins configuration (what is enabled <br>and what is not) and feature usage statistics (e.g. how frequently you are using code completion).<br>    This data is anonymous, does not contain any personal information, collected for use only by {0}<br> and will never be transmitted to any third party.</html>
\ No newline at end of file
+stats.config.details=<html>We are asking your permission to send information about your plugins configuration \
+  (what is enabled and what is not) and feature usage statistics (e.g. how frequently you are using code completion). \
+  This data is anonymous, does not contain any personal information, \
+  collected for use only by {0} and will never be transmitted to any third party.
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 64f737ce376b..00f42a06cd93 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -116,8 +116,8 @@
     <lang.syntaxHighlighterFactory key="XHTML" implementationClass="com.intellij.lang.xhtml.XhtmlSyntaxHighlighterFactory"/>
     <lang.syntaxHighlighterFactory key="DTD" implementationClass="com.intellij.lang.dtd.DtdSyntaxHighlighterFactory"/>
 
-    <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNamespaceAnnotator"/>
     <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNsPrefixAnnotator"/>
+    <annotator language="XML" implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlNamespaceAnnotator"/>
 
     <renameHandler id="xmlTagRenameHandler" implementation="com.intellij.xml.refactoring.XmlTagRenameHandler"/>
     <renameHandler implementation="com.intellij.xml.refactoring.SchemaPrefixRenameHandler" order="before xmlTagRenameHandler"/>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 26448ea7337f..014c6306a701 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -533,6 +533,7 @@
 
       <action id="WelcomeScreen.Configure.DesktopEntry" class="com.intellij.ide.actions.CreateDesktopEntryAction"
               icon="AllIcons.Welcome.CreateDesktopEntry"/>
+      <action id="WelcomeScreen.Update" class="com.intellij.openapi.updateSettings.impl.CheckForUpdateAction" text="Check for Update"/>
     </group>
 
     <group id="FileChooser">
@@ -582,8 +583,8 @@
     <group id="ChangeScheme">
       <action id="ChangeColorScheme" class="com.intellij.ide.actions.QuickChangeColorSchemeAction"/>
       <action id="ChangeKeymap" class="com.intellij.ide.actions.QuickChangeKeymapAction"/>
-      <action id="ChangeLaf" class="com.intellij.ide.actions.QuickChangeLookAndFeel"/>
       <action id="ChangeView" class="com.intellij.ide.actions.QuickChangeViewModeAction"/>
+      <action id="ChangeLaf" class="com.intellij.ide.actions.QuickChangeLookAndFeel"/>
     </group>
 
     <action id="MaintenanceAction" class="com.intellij.ide.actions.MaintenanceAction"/>
diff --git a/platform/remote-servers/impl/src/META-INF/RemoteServers.xml b/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
index 0ce5eae571a9..eae970f46594 100644
--- a/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
+++ b/platform/remote-servers/impl/src/META-INF/RemoteServers.xml
@@ -38,14 +38,16 @@
 
   <actions>
     <group id="RemoteServersViewToolbar">
-      <action id="RemoteServers.RunServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RunServerAction"/>
-      <action id="RemoteServers.DebugServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DebugServerAction"/>
-      <action id="RemoteServers.StopServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.StopServerAction"/>
-      <action id="RemoteServers.EditServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.EditConfigurationAction"/>
-      <separator/>
-      <action id="RemoteServers.DeployAll" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployAllAction"/>
+      <action id="RemoteServers.ConnectServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerConnectAction"/>
+      <action id="RemoteServers.DisconnectServer" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerDisconnectAction"/>
+      <action id="RemoteServers.EditServerConfig" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.RemoteServerConfigAction"/>
+      <action id="RemoteServers.ChooseServerDeployment" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.ChooseDeploymentAction"/>
+      <action id="RemoteServers.ChooseServerDeploymentWithDebug" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.ChooseDeploymentWithDebugAction"/>
+
       <action id="Servers.Deploy" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployAction"/>
       <action id="Servers.Undeploy" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.UndeployAction"/>
+      <action id="Servers.DeployWithDebug" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeployWithDebugAction"/>
+      <action id="RemoteServers.EditDeploymentConfig" class="com.intellij.remoteServer.impl.runtime.ui.tree.actions.DeploymentConfigAction"/>
     </group>
   </actions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
index 8a46887be6cf..2d3fb8cc1b86 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/ServersToolWindowContent.java
@@ -6,18 +6,16 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.ide.util.treeView.NodeRenderer;
 import com.intellij.ide.util.treeView.TreeVisitor;
-import com.intellij.openapi.application.ModalityState;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.remoteServer.configuration.RemoteServer;
 import com.intellij.remoteServer.impl.runtime.log.LoggingHandlerImpl;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
 import com.intellij.remoteServer.impl.runtime.ui.tree.TreeBuilderBase;
 import com.intellij.remoteServer.runtime.ConnectionStatus;
 import com.intellij.remoteServer.runtime.ServerConnection;
@@ -108,13 +106,10 @@ public class ServersToolWindowContent extends JPanel implements Disposable {
     new DoubleClickListener() {
       @Override
       protected boolean onDoubleClick(MouseEvent event) {
-        Set<ServersTreeStructure.RemoteServerNode> nodes = getSelectedRemoteServerNodes();
-        if (nodes.size() == 1) {
-          RemoteServer<?> server = nodes.iterator().next().getValue();
-          ServerConnectionManager.getInstance().getOrCreateConnection(server);
-          return true;
-        }
-        return false;
+        AnAction connectAction = ActionManager.getInstance().getAction("RemoteServers.ConnectServer");
+        AnActionEvent actionEvent = AnActionEvent.createFromInputEvent(connectAction, event, ActionPlaces.UNKNOWN);
+        connectAction.actionPerformed(actionEvent);
+        return true;
       }
     }.installOn(myTree);
   }
@@ -265,18 +260,6 @@ public class ServersToolWindowContent extends JPanel implements Disposable {
     return this;
   }
 
-  public Set<ServerNode> getSelectedServerNodes() {
-    return myBuilder.getSelectedElements(ServerNode.class);
-  }
-
-  public Set<DeploymentNode> getSelectedDeploymentNodes() {
-    return myBuilder.getSelectedElements(DeploymentNode.class);
-  }
-
-  public Set<ServersTreeStructure.RemoteServerNode> getSelectedRemoteServerNodes() {
-    return myBuilder.getSelectedElements(ServersTreeStructure.RemoteServerNode.class);
-  }
-
   @Override
   public void dispose() {
   }
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
index d859d61b7f3e..b147ee72df6c 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/DeploymentNode.java
@@ -5,18 +5,24 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author nik
  */
-public interface DeploymentNode {
+public interface DeploymentNode extends ServersTreeNode {
+
   @NotNull
   ServerNode getServerNode();
 
-  boolean isRedeployActionEnabled();
-  void redeploy();
+  boolean isDeployActionVisible();
+
+  boolean isDeployActionEnabled();
+
+  void deploy();
 
   boolean isUndeployActionEnabled();
+
   void undeploy();
 
-  boolean isEditConfigurationActionEnabled();
-  void editConfiguration();
+  boolean isDebugActionVisible();
+
+  void deployWithDebug();
 
   boolean isDeployed();
 
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
index d17a730002fb..d3d160cff2e3 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServerNode.java
@@ -1,26 +1,9 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree;
 
-import com.intellij.execution.Executor;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * @author nik
  */
-public interface ServerNode {
-  boolean isConnected();
 
-  boolean isStopActionEnabled();
-  void stopServer();
+public interface ServerNode extends ServersTreeNode {
 
-  boolean isStartActionEnabled(@NotNull Executor executor);
-  void startServer(@NotNull Executor executor);
-
-  boolean isDeployActionEnabled();
-  void deploy(AnActionEvent e);
-
-  boolean isDeployAllActionEnabled();
-  void deployAll();
-
-  void editConfiguration();
 }
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java
new file mode 100644
index 000000000000..84cd735aaba6
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeNode.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree;
+
+public interface ServersTreeNode {
+
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
index 7a2a053779d5..5f1969ecbea3 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/ServersTreeStructure.java
@@ -3,6 +3,7 @@ package com.intellij.remoteServer.impl.runtime.ui.tree;
 import com.intellij.execution.Executor;
 import com.intellij.execution.ProgramRunnerUtil;
 import com.intellij.execution.RunnerAndConfigurationSettings;
+import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.executors.DefaultRunExecutor;
 import com.intellij.execution.impl.RunDialog;
 import com.intellij.execution.runners.ExecutionEnvironment;
@@ -18,13 +19,16 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.remoteServer.ServerType;
 import com.intellij.remoteServer.configuration.RemoteServer;
 import com.intellij.remoteServer.configuration.RemoteServersManager;
 import com.intellij.remoteServer.configuration.ServerConfiguration;
 import com.intellij.remoteServer.configuration.deployment.DeploymentConfigurationManager;
 import com.intellij.remoteServer.impl.configuration.SingleRemoteServerConfigurable;
+import com.intellij.remoteServer.impl.configuration.deployment.DeployToServerRunConfiguration;
 import com.intellij.remoteServer.impl.runtime.deployment.DeploymentTaskImpl;
 import com.intellij.remoteServer.impl.runtime.log.DeploymentLogManagerImpl;
 import com.intellij.remoteServer.impl.runtime.log.LoggingHandlerImpl;
@@ -38,6 +42,7 @@ import com.intellij.remoteServer.runtime.deployment.DeploymentStatus;
 import com.intellij.remoteServer.runtime.deployment.DeploymentTask;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.ui.awt.RelativePoint;
+import com.intellij.util.containers.ContainerUtil;
 import icons.RemoteServersIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -160,50 +165,65 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       return ServerConnectionManager.getInstance().getConnection(getValue());
     }
 
-    @Override
     public boolean isConnected() {
       ServerConnection<?> connection = getConnection();
       return connection != null && connection.getStatus() == ConnectionStatus.CONNECTED;
     }
 
-    @Override
-    public boolean isDeployActionEnabled() {
-      return true;
+    public void deploy(AnActionEvent e) {
+      doDeploy(e, DefaultRunExecutor.getRunExecutorInstance(), "Deploy Configuration", true);
     }
 
-    @Override
-    public void deploy(AnActionEvent e) {
-      final ServerType<? extends ServerConfiguration> serverType = getValue().getType();
+    public void deployWithDebug(AnActionEvent e) {
+      doDeploy(e, DefaultDebugExecutor.getDebugExecutorInstance(), "Deploy and Debug Configuration", false);
+    }
+
+    public void doDeploy(AnActionEvent e, final Executor executor, String popupTitle, boolean canCreate) {
+      final RemoteServer<?> server = getValue();
+      final ServerType<? extends ServerConfiguration> serverType = server.getType();
       final DeploymentConfigurationManager configurationManager = DeploymentConfigurationManager.getInstance(doGetProject());
-      List<RunnerAndConfigurationSettings> list = new ArrayList<RunnerAndConfigurationSettings>(configurationManager.getDeploymentConfigurations(serverType));
-      list.add(null);
-      ListPopup popup = JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<RunnerAndConfigurationSettings>("Deploy Configuration", list) {
-        @Override
-        public Icon getIconFor(RunnerAndConfigurationSettings value) {
-          return value != null ? serverType.getIcon() : null;
-        }
+      List<RunnerAndConfigurationSettings> list
+        = ContainerUtil.filter(configurationManager.getDeploymentConfigurations(serverType),
+                               new Condition<RunnerAndConfigurationSettings>() {
 
-        @NotNull
-        @Override
-        public String getTextFor(RunnerAndConfigurationSettings value) {
-          return value != null ? value.getName() : "Create...";
-        }
+                                 @Override
+                                 public boolean value(RunnerAndConfigurationSettings settings) {
+                                   DeployToServerRunConfiguration configuration =
+                                     (DeployToServerRunConfiguration)settings.getConfiguration();
+                                   return StringUtil.equals(server.getName(), configuration.getServerName());
+                                 }
+                               });
+      if (canCreate) {
+        list.add(null);
+      }
+      ListPopup popup =
+        JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<RunnerAndConfigurationSettings>(popupTitle, list) {
+          @Override
+          public Icon getIconFor(RunnerAndConfigurationSettings value) {
+            return value != null ? serverType.getIcon() : null;
+          }
 
-        @Override
-        public PopupStep onChosen(final RunnerAndConfigurationSettings selectedValue, boolean finalChoice) {
-          return doFinalStep(new Runnable() {
-            @Override
-            public void run() {
-              if (selectedValue != null) {
-                ProgramRunnerUtil.executeConfiguration(doGetProject(), selectedValue, DefaultRunExecutor.getRunExecutorInstance());
+          @NotNull
+          @Override
+          public String getTextFor(RunnerAndConfigurationSettings value) {
+            return value != null ? value.getName() : "Create...";
+          }
+
+          @Override
+          public PopupStep onChosen(final RunnerAndConfigurationSettings selectedValue, boolean finalChoice) {
+            return doFinalStep(new Runnable() {
+              @Override
+              public void run() {
+                if (selectedValue != null) {
+                  ProgramRunnerUtil.executeConfiguration(doGetProject(), selectedValue, executor);
+                }
+                else {
+                  configurationManager.createAndRunConfiguration(serverType, RemoteServerNode.this.getValue());
+                }
               }
-              else {
-                configurationManager.createAndRunConfiguration(serverType, RemoteServerNode.this.getValue());
-              }
-            }
-          });
-        }
-      });
+            });
+          }
+        });
       if (e.getInputEvent() instanceof MouseEvent) {
         popup.show(new RelativePoint((MouseEvent)e.getInputEvent()));
       }
@@ -212,45 +232,10 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       }
     }
 
-    @Override
-    public boolean isStopActionEnabled() {
-      return isConnected();
-    }
-
-    @Override
-    public void stopServer() {
-      ServerConnection<?> connection = getConnection();
-      if (connection != null) {
-        connection.disconnect();
-      }
-    }
-
-    @Override
     public void editConfiguration() {
       ShowSettingsUtil.getInstance().editConfigurable(doGetProject(), new SingleRemoteServerConfigurable(getValue(), null, false));
     }
 
-    @Override
-    public boolean isStartActionEnabled(@NotNull Executor executor) {
-      ServerConnection connection = getConnection();
-      return executor.equals(DefaultRunExecutor.getRunExecutorInstance()) &&
-             (connection == null || connection.getStatus() == ConnectionStatus.DISCONNECTED);
-    }
-
-    @Override
-    public void startServer(@NotNull Executor executor) {
-      ServerConnectionManager.getInstance().getOrCreateConnection(getValue());
-    }
-
-    @Override
-    public boolean isDeployAllActionEnabled() {
-      return false;
-    }
-
-    @Override
-    public void deployAll() {
-    }
-
     @Nullable
     private Icon getStatusIcon(final ConnectionStatus status) {
       switch (status) {
@@ -278,23 +263,42 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
     }
 
     @Override
-    public boolean isRedeployActionEnabled() {
+    public boolean isDeployActionVisible() {
       DeploymentTask<?> deploymentTask = getValue().getDeploymentTask();
       return deploymentTask instanceof DeploymentTaskImpl<?> && ((DeploymentTaskImpl)deploymentTask).getExecutionEnvironment().getRunnerAndConfigurationSettings() != null;
     }
 
     @Override
-    public void redeploy() {
+    public boolean isDeployActionEnabled() {
+      return true;
+    }
+
+    @Override
+    public void deploy() {
+      doDeploy(DefaultRunExecutor.getRunExecutorInstance());
+    }
+
+    public void doDeploy(Executor executor) {
       DeploymentTask<?> deploymentTask = getValue().getDeploymentTask();
       if (deploymentTask != null) {
         ExecutionEnvironment environment = ((DeploymentTaskImpl)deploymentTask).getExecutionEnvironment();
         RunnerAndConfigurationSettings settings = environment.getRunnerAndConfigurationSettings();
         if (settings != null) {
-          ProgramRunnerUtil.executeConfiguration(doGetProject(), settings, DefaultRunExecutor.getRunExecutorInstance());
+          ProgramRunnerUtil.executeConfiguration(doGetProject(), settings, executor);
         }
       }
     }
 
+    @Override
+    public boolean isDebugActionVisible() {
+      return myParentNode.getValue().getType().createDebugConnector() != null;
+    }
+
+    @Override
+    public void deployWithDebug() {
+      doDeploy(DefaultDebugExecutor.getDebugExecutorInstance());
+    }
+
     @Override
     public boolean isUndeployActionEnabled() {
       DeploymentRuntime runtime = getValue().getRuntime();
@@ -309,12 +313,10 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
       }
     }
 
-    @Override
-    public boolean isEditConfigurationActionEnabled() {
+    public boolean isEditConfigurationActionVisible() {
       return getValue().getDeploymentTask() != null;
     }
 
-    @Override
     public void editConfiguration() {
       DeploymentTask<?> task = getValue().getDeploymentTask();
       if (task != null) {
@@ -396,7 +398,7 @@ public class ServersTreeStructure extends AbstractTreeStructureBase {
     }
   }
 
-  public class DeploymentLogNode extends AbstractTreeNode<Pair<LoggingHandlerImpl, String>> implements LogProvidingNode {
+  public class DeploymentLogNode extends AbstractTreeNode<Pair<LoggingHandlerImpl, String>> implements ServersTreeNode, LogProvidingNode {
     @NotNull private final DeploymentNodeImpl myDeploymentNode;
 
     public DeploymentLogNode(@NotNull Pair<LoggingHandlerImpl, String> value, @NotNull DeploymentNodeImpl deploymentNode) {
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java
new file mode 100644
index 000000000000..1a762f75cf01
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentAction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import org.jetbrains.annotations.NotNull;
+
+public class ChooseDeploymentAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public ChooseDeploymentAction() {
+    super("Deploy", "Deploy a chosen item to the selected remote server", AllIcons.Nodes.Deploy);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, ServersTreeStructure.RemoteServerNode node) {
+    node.deploy(e);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java
new file mode 100644
index 000000000000..55e2b1cb509f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ChooseDeploymentWithDebugAction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import org.jetbrains.annotations.NotNull;
+
+public class ChooseDeploymentWithDebugAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public ChooseDeploymentWithDebugAction() {
+    super("Debug", "Deploy and debug a chosen item on the selected remote server", AllIcons.Actions.StartDebugger);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, ServersTreeStructure.RemoteServerNode node) {
+    node.deployWithDebug(e);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java
deleted file mode 100644
index f519478ef84c..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DebugServerAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.execution.Executor;
-import com.intellij.execution.executors.DefaultDebugExecutor;
-import com.intellij.icons.AllIcons;
-
-/**
- * @author michael.golubev
- */
-public class DebugServerAction extends RunServerActionBase {
-  public DebugServerAction() {
-    super("Debug", "Start the selected server in debug mode", AllIcons.Actions.StartDebugger);
-  }
-
-  @Override
-  protected Executor getExecutor() {
-    return DefaultDebugExecutor.getDebugExecutorInstance();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
index c6a38404192e..4b8bbeeea7e7 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
@@ -1,67 +1,50 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
 import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Set;
-
 /**
  * @author michael.golubev
  */
-public class DeployAction extends ServersTreeActionBase {
+public class DeployAction extends ServersTreeAction<DeploymentNode> {
+
   public DeployAction() {
     super("Deploy", "Deploy the selected item", AllIcons.Nodes.Deploy);
   }
 
   @Override
-  protected void updatePresentation(@NotNull Presentation presentation, @Nullable ServersToolWindowContent content) {
-    if (content != null) {
-      Set<DeploymentNode> nodes = content.getSelectedDeploymentNodes();
-      if (nodes.size() == 1) {
-        DeploymentNode node = nodes.iterator().next();
-        if (node.isDeployed()) {
-          presentation.setText("Redeploy");
-          presentation.setDescription("Redeploy '" + node.getDeploymentName() + "'");
-          return;
-        }
-      }
-    }
-    presentation.setText(getTemplatePresentation().getText());
-    presentation.setDescription(getTemplatePresentation().getDescription());
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
   }
 
   @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() + serverNodes.size() != 1) return false;
-    for (DeploymentNode node : deploymentNodes) {
-      if (!node.isRedeployActionEnabled()) {
-        return false;
-      }
+  protected void updatePresentation(@NotNull Presentation presentation, @Nullable DeploymentNode node) {
+    if (node != null && node.isDeployed()) {
+      presentation.setText("Redeploy");
+      presentation.setDescription("Redeploy '" + node.getDeploymentName() + "'");
     }
-    for (ServerNode serverNode : serverNodes) {
-      if (!serverNode.isDeployActionEnabled()) {
-        return false;
-      }
+    else {
+      presentation.setText(getTemplatePresentation().getText());
+      presentation.setDescription(getTemplatePresentation().getDescription());
     }
-    return true;
   }
 
   @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      node.redeploy();
-    }
-    for (ServerNode node : content.getSelectedServerNodes()) {
-      node.deploy(e);
-    }
+  protected boolean isVisible4(DeploymentNode node) {
+    return node.isDeployActionVisible();
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
+    return node.isDeployActionEnabled();
+  }
+
+  @Override
+  protected void doActionPerformed(DeploymentNode node) {
+    node.deploy();
   }
 }
 
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java
deleted file mode 100644
index 818f0ad7619e..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAllAction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author michael.golubev
- */
-public class DeployAllAction extends ServerActionBase {
-
-  public DeployAllAction() {
-    super("Deploy All", "Deploy all the artifacts of the selected server", AllIcons.Nodes.Deploy);
-  }
-
-  @Override
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isDeployAllActionEnabled()) {
-      serverNode.deployAll();
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isDeployAllActionEnabled();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java
new file mode 100644
index 000000000000..d9c00380b9e2
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployWithDebugAction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
+
+public class DeployWithDebugAction extends ServersTreeAction<DeploymentNode> {
+
+  public DeployWithDebugAction() {
+    super("Debug", "Deploy and debug the selected item", AllIcons.Actions.StartDebugger);
+  }
+
+  @Override
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
+  }
+
+  @Override
+  protected boolean isVisible4(DeploymentNode node) {
+    return node.isDeployActionVisible() && node.isDebugActionVisible();
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
+    return node.isDeployActionEnabled();
+  }
+
+  @Override
+  protected void doActionPerformed(DeploymentNode node) {
+    node.deployWithDebug();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java
deleted file mode 100644
index 27bace389c41..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentActionBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author nik
- */
-public abstract class DeploymentActionBase extends ServersTreeActionBase {
-  protected DeploymentActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  protected abstract void perform(@NotNull List<DeploymentNode> nodes, ServersToolWindowContent content, AnActionEvent e);
-
-  protected abstract boolean isApplicable(@NotNull DeploymentNode node);
-
-  @Override
-  public void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    List<DeploymentNode> toPerform = new ArrayList<DeploymentNode>();
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      if (isApplicable(node)) {
-        toPerform.add(node);
-      }
-    }
-    if (!toPerform.isEmpty()) {
-      perform(toPerform, content, e);
-    }
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<?> selectedElements = content.getBuilder().getSelectedElements();
-    if (selectedElements.isEmpty() || selectedElements.size() != content.getSelectedDeploymentNodes().size()) {
-      return false;
-    }
-
-    for (DeploymentNode node : content.getSelectedDeploymentNodes()) {
-      if (!isApplicable(node)) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java
new file mode 100644
index 000000000000..e7f1960ae41f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeploymentConfigAction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+
+public class DeploymentConfigAction extends EditConfigurationActionBase<ServersTreeStructure.DeploymentNodeImpl> {
+
+  public DeploymentConfigAction() {
+    super("Edit the selected deployment run configuration");
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.DeploymentNodeImpl> getTargetNodeClass() {
+    return ServersTreeStructure.DeploymentNodeImpl.class;
+  }
+
+  @Override
+  protected boolean isVisible4(ServersTreeStructure.DeploymentNodeImpl node) {
+    return node.isEditConfigurationActionVisible();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.DeploymentNodeImpl node) {
+    node.editConfiguration();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java
deleted file mode 100644
index 75d22a854114..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public class EditConfigurationAction extends ServersTreeActionBase {
-  public EditConfigurationAction() {
-    super("Edit Configuration", "Edit configuration of the selected server", AllIcons.Actions.EditSource);
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() == 1) {
-      deploymentNodes.iterator().next().editConfiguration();
-    }
-    else {
-      serverNodes.iterator().next().editConfiguration();
-    }
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<DeploymentNode> deploymentNodes = content.getSelectedDeploymentNodes();
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    if (deploymentNodes.size() + serverNodes.size() != 1) return false;
-    if (deploymentNodes.size() == 1) {
-      return deploymentNodes.iterator().next().isEditConfigurationActionEnabled();
-    }
-    return true;
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java
new file mode 100644
index 000000000000..05fcb95fede5
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/EditConfigurationActionBase.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeNode;
+
+public abstract class EditConfigurationActionBase<T extends ServersTreeNode> extends ServersTreeAction<T> {
+
+  public EditConfigurationActionBase(String description) {
+    super("Edit Configuration", description, AllIcons.Actions.EditSource);
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java
new file mode 100644
index 000000000000..b5f5456318da
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConfigAction.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+
+public class RemoteServerConfigAction extends EditConfigurationActionBase<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerConfigAction() {
+    super("Edit the selected remote server configuration");
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    node.editConfiguration();
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java
new file mode 100644
index 000000000000..8fd5f7891748
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerConnectAction.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import com.intellij.remoteServer.runtime.ServerConnectionManager;
+
+public class RemoteServerConnectAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerConnectAction() {
+    super("Connect", "Connect to the selected remote server", AllIcons.Actions.Execute);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(ServersTreeStructure.RemoteServerNode node) {
+    return !node.isConnected();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    ServerConnectionManager.getInstance().getOrCreateConnection(node.getValue());
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java
new file mode 100644
index 000000000000..96f21e56671f
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RemoteServerDisconnectAction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeStructure;
+import com.intellij.remoteServer.runtime.ServerConnection;
+import com.intellij.remoteServer.runtime.ServerConnectionManager;
+
+public class RemoteServerDisconnectAction extends ServersTreeAction<ServersTreeStructure.RemoteServerNode> {
+
+  public RemoteServerDisconnectAction() {
+    super("Disconnect", "Disconnect from the selected remote server", AllIcons.Actions.Suspend);
+  }
+
+  @Override
+  protected Class<ServersTreeStructure.RemoteServerNode> getTargetNodeClass() {
+    return ServersTreeStructure.RemoteServerNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(ServersTreeStructure.RemoteServerNode node) {
+    return node.isConnected();
+  }
+
+  @Override
+  protected void doActionPerformed(ServersTreeStructure.RemoteServerNode node) {
+    ServerConnection<?> connection = ServerConnectionManager.getInstance().getConnection(node.getValue());
+    if (connection != null) {
+      connection.disconnect();
+    }
+  }
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java
deleted file mode 100644
index aa16c77e2aeb..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.execution.Executor;
-import com.intellij.execution.executors.DefaultRunExecutor;
-import com.intellij.icons.AllIcons;
-
-/**
- * @author michael.golubev
- */
-public class RunServerAction extends RunServerActionBase {
-
-  public RunServerAction() {
-    super("Run/Connect", "Run/Connect to the selected server", AllIcons.Actions.Execute);
-  }
-
-  @Override
-  protected Executor getExecutor() {
-    return DefaultRunExecutor.getRunExecutorInstance();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java
deleted file mode 100644
index 07b1e4b683f1..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/RunServerActionBase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-
-import com.intellij.execution.Executor;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-/**
- * @author michael.golubev
- */
-public abstract class RunServerActionBase extends ServerActionBase {
-
-  protected RunServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isStartActionEnabled(getExecutor())) {
-      serverNode.startServer(getExecutor());
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isStartActionEnabled(getExecutor());
-  }
-
-  protected abstract Executor getExecutor();
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java
deleted file mode 100644
index 1b4d4f8bbd89..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServerActionBase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public abstract class ServerActionBase extends ServersTreeActionBase {
-
-  protected ServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  protected final boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<ServerNode> selectedServerNodes = content.getSelectedServerNodes();
-    Set<?> selectedElements = content.getBuilder().getSelectedElements();
-    if (selectedElements.size() != selectedServerNodes.size() || selectedElements.isEmpty()) {
-      return false;
-    }
-
-    for (ServerNode selectedServer : selectedServerNodes) {
-      if (!isEnabledForServer(selectedServer)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    for (ServerNode node : content.getSelectedServerNodes()) {
-      performAction(node);
-    }
-  }
-
-  protected abstract void performAction(@NotNull ServerNode serverNode);
-
-  protected abstract boolean isEnabledForServer(@NotNull ServerNode serverNode);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java
new file mode 100644
index 000000000000..d86a708196d2
--- /dev/null
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java
@@ -0,0 +1,91 @@
+package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
+import com.intellij.remoteServer.impl.runtime.ui.tree.ServersTreeNode;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.util.Set;
+
+public abstract class ServersTreeAction<T extends ServersTreeNode> extends AnAction {
+
+  protected ServersTreeAction(String text, String description, Icon icon) {
+    super(text, description, icon);
+  }
+
+  @Override
+  public void update(@NotNull AnActionEvent e) {
+    Presentation presentation = e.getPresentation();
+    T targetNode = getTargetNode(e);
+
+    boolean visible = false;
+    boolean enabled = false;
+
+    if (targetNode != null) {
+      visible = isVisible4(targetNode);
+      if (visible) {
+        enabled = isEnabled4(targetNode);
+      }
+    }
+
+    presentation.setVisible(visible);
+    presentation.setEnabled(enabled);
+    updatePresentation(presentation, targetNode);
+  }
+
+  private T getTargetNode(AnActionEvent e) {
+    ServersToolWindowContent content = getContent(e);
+    if (content == null) {
+      return null;
+    }
+    Set<Object> selectedElements = content.getBuilder().getSelectedElements();
+    if (selectedElements.size() != 1) {
+      return null;
+    }
+    ServersTreeNode node = (ServersTreeNode)selectedElements.iterator().next();
+    Class<T> targetNodeClass = getTargetNodeClass();
+    if (!targetNodeClass.isInstance(node)) {
+      return null;
+    }
+    return targetNodeClass.cast(node);
+  }
+
+  private static ServersToolWindowContent getContent(AnActionEvent e) {
+    return e.getData(ServersToolWindowContent.KEY);
+  }
+
+  @Override
+  public void actionPerformed(@NotNull AnActionEvent e) {
+    T targetNode = getTargetNode(e);
+    if (targetNode != null && isVisible4(targetNode) && isEnabled4(targetNode)) {
+      doActionPerformed(getContent(e), e, targetNode);
+    }
+  }
+
+
+  protected boolean isVisible4(T node) {
+    return true;
+  }
+
+  protected boolean isEnabled4(T node) {
+    return true;
+  }
+
+  protected void updatePresentation(@NotNull Presentation presentation, @Nullable T node) {
+  }
+
+
+  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e, T node) {
+    doActionPerformed(node);
+  }
+
+  protected void doActionPerformed(T node) {
+    throw new UnsupportedOperationException();
+  }
+
+  protected abstract Class<T> getTargetNodeClass();
+}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java
deleted file mode 100644
index 7e505bd06aab..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeActionBase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-
-/**
- * @author michael.golubev
- */
-public abstract class ServersTreeActionBase extends AnAction {
-
-  protected ServersTreeActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    ServersToolWindowContent content = e.getData(ServersToolWindowContent.KEY);
-    Presentation presentation = e.getPresentation();
-    presentation.setEnabled(content != null && isEnabled(content, e));
-    updatePresentation(presentation, content);
-  }
-
-  protected void updatePresentation(@NotNull Presentation presentation, @Nullable ServersToolWindowContent content) {
-  }
-
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-    ServersToolWindowContent content = e.getData(ServersToolWindowContent.KEY);
-    if (content == null) {
-      return;
-    }
-    doActionPerformed(content, e);
-  }
-
-  protected abstract boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e);
-
-  protected abstract void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java
deleted file mode 100644
index 50ec63646922..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/SingleServerActionBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Set;
-
-/**
- * @author michael.golubev
- */
-public abstract class SingleServerActionBase extends ServersTreeActionBase {
-  protected SingleServerActionBase(String text, String description, Icon icon) {
-    super(text, description, icon);
-  }
-
-  @Override
-  protected void doActionPerformed(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    doActionPerformed(content, content.getSelectedServerNodes().iterator().next());
-  }
-
-  @Override
-  protected boolean isEnabled(@NotNull ServersToolWindowContent content, AnActionEvent e) {
-    Set<ServerNode> serverNodes = content.getSelectedServerNodes();
-    return content.getBuilder().getSelectedElements().size() == serverNodes.size() && serverNodes.size() == 1 &&
-           isEnabledForServer(serverNodes.iterator().next());
-  }
-
-  protected abstract boolean isEnabledForServer(ServerNode serverNode);
-
-  protected abstract void doActionPerformed(@NotNull ServersToolWindowContent content, @NotNull ServerNode server);
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java
deleted file mode 100644
index 7984c119036c..000000000000
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/StopServerAction.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.remoteServer.impl.runtime.ui.tree.ServerNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author michael.golubev
- */
-public class StopServerAction extends ServerActionBase {
-
-  public StopServerAction() {
-    super("Stop/Disconnect", "Stop/disconnect from the selected server", AllIcons.Actions.Suspend);
-  }
-
-  protected void performAction(@NotNull ServerNode serverNode) {
-    if (serverNode.isStopActionEnabled()) {
-      serverNode.stopServer();
-    }
-  }
-
-  @Override
-  protected boolean isEnabledForServer(@NotNull ServerNode serverNode) {
-    return serverNode.isStopActionEnabled();
-  }
-}
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
index bc11f8aa94a8..50c247eabd91 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/UndeployAction.java
@@ -1,30 +1,29 @@
 package com.intellij.remoteServer.impl.runtime.ui.tree.actions;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.remoteServer.impl.runtime.ui.ServersToolWindowContent;
 import com.intellij.remoteServer.impl.runtime.ui.tree.DeploymentNode;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
 
 /**
  * @author michael.golubev
  */
-public class UndeployAction extends DeploymentActionBase {
+public class UndeployAction extends ServersTreeAction<DeploymentNode> {
+
   public UndeployAction() {
     super("Undeploy", "Undeploy the selected item", AllIcons.Nodes.Undeploy);
   }
 
   @Override
-  protected boolean isApplicable(@NotNull DeploymentNode node) {
+  protected Class<DeploymentNode> getTargetNodeClass() {
+    return DeploymentNode.class;
+  }
+
+  @Override
+  protected boolean isEnabled4(DeploymentNode node) {
     return node.isUndeployActionEnabled();
   }
 
   @Override
-  protected void perform(@NotNull List<DeploymentNode> nodes, ServersToolWindowContent content, AnActionEvent e) {
-    for (DeploymentNode node : nodes) {
-      node.undeploy();
-    }
+  protected void doActionPerformed(DeploymentNode node) {
+    node.undeploy();
   }
 }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
index 77a91e8543d1..3925239a98d2 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
@@ -10,22 +10,17 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.*;
 
-class FieldProcessor<T> {
-  private final Class<T> typeClass;
-
+final class FieldProcessor<T> {
   private final List<FieldLoader> fieldLoaders = new ArrayList<>(2);
   private final LinkedHashMap<Method, MethodHandler> methodHandlerMap = new LinkedHashMap<>();
   private final List<VolatileFieldBinding> volatileFields = new ArrayList<>(2);
   boolean lazyRead;
   private final InterfaceReader reader;
 
-  FieldProcessor(InterfaceReader reader, Class<T> typeClass) {
-    this.typeClass = typeClass;
+  FieldProcessor(@NotNull InterfaceReader reader, @NotNull Class<T> typeClass) {
     this.reader = reader;
-  }
 
-  void go() {
-    Method[] methods = typeClass.getDeclaredMethods();
+    Method[] methods = typeClass.getMethods();
     // todo sort by source location
     Arrays.sort(methods, new Comparator<Method>() {
       @Override
@@ -34,58 +29,77 @@ class FieldProcessor<T> {
       }
     });
 
-    for (Method m : methods) {
+    Package aPackage = typeClass.getPackage();
+    for (Method method : methods) {
+      Class<?> methodClass = method.getDeclaringClass();
+      // use method from super if super located in the same package
+      if (methodClass != typeClass && methodClass.getPackage() != aPackage) {
+        continue;
+      }
+
+      if (method.getParameterTypes().length != 0) {
+        throw new JsonProtocolModelParseException("No parameters expected in " + method);
+      }
+
       try {
-        processMethod(m);
+        String fieldName = checkAndGetJsonFieldName(method);
+        MethodHandler methodHandler;
+
+        JsonSubtypeCasting jsonSubtypeCaseAnnotation = method.getAnnotation(JsonSubtypeCasting.class);
+        if (jsonSubtypeCaseAnnotation != null) {
+          methodHandler = processManualSubtypeMethod(method, jsonSubtypeCaseAnnotation);
+          lazyRead = true;
+        }
+        else {
+          methodHandler = processFieldGetterMethod(method, fieldName);
+        }
+        methodHandlerMap.put(method, methodHandler);
       }
       catch (JsonProtocolModelParseException e) {
-        throw new JsonProtocolModelParseException("Problem with method " + m, e);
+        throw new JsonProtocolModelParseException("Problem with method " + method, e);
       }
     }
   }
 
-  private void processMethod(Method m) {
-    if (m.getParameterTypes().length != 0) {
-      throw new JsonProtocolModelParseException("No parameters expected in " + m);
-    }
-    String fieldName = checkAndGetJsonFieldName(m);
-    MethodHandler methodHandler;
-
-    JsonSubtypeCasting jsonSubtypeCaseAnnotation = m.getAnnotation(JsonSubtypeCasting.class);
-    if (jsonSubtypeCaseAnnotation != null) {
-      methodHandler = processManualSubtypeMethod(m, jsonSubtypeCaseAnnotation);
-      lazyRead = true;
-    }
-    else {
-      methodHandler = processFieldGetterMethod(m, fieldName);
-    }
-    methodHandlerMap.put(m, methodHandler);
-  }
-
-  private MethodHandler processFieldGetterMethod(Method m, String fieldName) {
-    Type genericReturnType = m.getGenericReturnType();
+  private MethodHandler processFieldGetterMethod(@NotNull Method method, @NotNull String fieldName) {
+    Type genericReturnType = method.getGenericReturnType();
     boolean nullable;
-    if (m.getAnnotation(JsonNullable.class) != null) {
+    if (method.getAnnotation(JsonNullable.class) != null) {
       nullable = true;
     }
     else if (genericReturnType == String.class || genericReturnType == Enum.class) {
-      JsonField jsonField = m.getAnnotation(JsonField.class);
+      JsonField jsonField = method.getAnnotation(JsonField.class);
       if (jsonField != null) {
         nullable = jsonField.optional() && !jsonField.allowAnyPrimitiveValue() && !jsonField.allowAnyPrimitiveValueAndMap();
       }
       else {
-        nullable = m.getAnnotation(JsonOptionalField.class) != null;
+        nullable = method.getAnnotation(JsonOptionalField.class) != null;
       }
     }
     else {
       nullable = false;
     }
 
-    ValueReader fieldTypeParser = reader.getFieldTypeParser(genericReturnType, nullable, false, m);
+    ValueReader fieldTypeParser = reader.getFieldTypeParser(genericReturnType, nullable, false, method);
     if (fieldTypeParser != InterfaceReader.VOID_PARSER) {
       fieldLoaders.add(new FieldLoader(fieldName, fieldTypeParser));
     }
-    return new PreparsedFieldMethodHandler(fieldTypeParser == InterfaceReader.VOID_PARSER ? null : fieldName);
+
+    final String effectiveFieldName = fieldTypeParser == InterfaceReader.VOID_PARSER ? null : fieldName;
+    return new MethodHandler() {
+      @Override
+      void writeMethodImplementationJava(@NotNull ClassScope scope, @NotNull Method method, @NotNull TextOutput out) {
+        if (!nullable) {
+          out.append("@NotNull").newLine();
+        }
+        writeMethodDeclarationJava(out, method);
+        out.openBlock();
+        if (effectiveFieldName != null) {
+          out.append("return ").append(FieldLoader.FIELD_PREFIX).append(effectiveFieldName).semi();
+        }
+        out.closeBlock();
+      }
+    };
   }
 
   private MethodHandler processManualSubtypeMethod(final Method m, JsonSubtypeCasting jsonSubtypeCaseAnn) {
@@ -131,17 +145,18 @@ class FieldProcessor<T> {
     return binding;
   }
 
-  private static String checkAndGetJsonFieldName(Method m) {
-    if (m.getParameterTypes().length != 0) {
+  @NotNull
+  private static String checkAndGetJsonFieldName(@NotNull Method method) {
+    if (method.getParameterTypes().length != 0) {
       throw new JsonProtocolModelParseException("Must have 0 parameters");
     }
-    JsonField fieldAnn = m.getAnnotation(JsonField.class);
-    if (fieldAnn != null) {
-      String jsonLiteralName = fieldAnn.jsonLiteralName();
+    JsonField fieldAnnotation = method.getAnnotation(JsonField.class);
+    if (fieldAnnotation != null) {
+      String jsonLiteralName = fieldAnnotation.jsonLiteralName();
       if (!jsonLiteralName.isEmpty()) {
         return jsonLiteralName;
       }
     }
-    return m.getName();
+    return method.getName();
   }
 }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
index a02b4ae8f18a..2cb6b9a28d07 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java
@@ -161,8 +161,6 @@ class InterfaceReader {
     }
 
     FieldProcessor<T> fields = new FieldProcessor<>(this, typeClass);
-    fields.go();
-
     LinkedHashMap<Method, MethodHandler> methodHandlerMap = fields.getMethodHandlerMap();
     for (Method method : methodHandlerMap.keySet()) {
       Class<?> returnType = method.getReturnType();
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
index a877b654c020..a9caa4e22929 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/MethodHandler.java
@@ -14,10 +14,10 @@ import java.util.List;
 abstract class MethodHandler {
   abstract void writeMethodImplementationJava(ClassScope classScope, Method m, TextOutput out);
 
-  protected static void appendMethodSignatureJava(@NotNull Method m, @NotNull List<String> paramNames, @NotNull TextOutput out) {
-    out.append(m.getName()).append('(');
+  protected static void appendMethodSignatureJava(@NotNull Method method, @NotNull List<String> paramNames, @NotNull TextOutput out) {
+    out.append(method.getName()).append('(');
     boolean firstArg = true;
-    Type[] types = m.getGenericParameterTypes();
+    Type[] types = method.getGenericParameterTypes();
     for (int i = 0, length = types.length; i < length; i++) {
       Type arg = types[i];
       if (firstArg) {
@@ -32,8 +32,8 @@ abstract class MethodHandler {
     out.append(')');
   }
 
-  protected static void writeMethodDeclarationJava(TextOutput out, Method m) {
-    writeMethodDeclarationJava(out, m, Collections.<String>emptyList());
+  protected static void writeMethodDeclarationJava(TextOutput out, Method method) {
+    writeMethodDeclarationJava(out, method, Collections.<String>emptyList());
   }
 
   protected static void writeMethodDeclarationJava(@NotNull TextOutput out, @NotNull Method m, @NotNull List<String> paramNames) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java
deleted file mode 100644
index 19e7714a0bd2..000000000000
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PreparsedFieldMethodHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import java.lang.reflect.Method;
-
-class PreparsedFieldMethodHandler extends MethodHandler {
-  private final String fieldName;
-
-  PreparsedFieldMethodHandler(String fieldName) {
-    this.fieldName = fieldName;
-  }
-
-  @Override
-  void writeMethodImplementationJava(ClassScope scope, Method m, TextOutput out) {
-    writeMethodDeclarationJava(out, m);
-    out.openBlock();
-    if (fieldName != null) {
-      out.append("return ").append(FieldLoader.FIELD_PREFIX).append(fieldName).semi();
-    }
-    out.closeBlock();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
index 5e53088b9b39..4f950fc4bb44 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/PrimitiveValueReader.java
@@ -38,11 +38,13 @@ class PrimitiveValueReader extends ValueReader {
     if (asRawString) {
       out.append("readRawString(");
       addReaderParameter(subtyping, out);
+      out.append(')');
     }
     else {
-      beginReadCall(readPostfix, subtyping, out, fieldName);
+      ValueReader.addReaderParameter(subtyping, out);
+      out.append(".next").append(readPostfix).append("()");
+      //beginReadCall(readPostfix, subtyping, out, fieldName);
     }
-    out.append(')');
   }
 
   @Override
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
index 56dcc310fa83..ca3253b1595b 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReadDelegate.java
@@ -23,7 +23,7 @@ class ReadDelegate {
     paramNames = hasNextNameParam ? STATIC_METHOD_PARAM_NAME_LIST2 : STATIC_METHOD_PARAM_NAME_LIST;
   }
 
-  void write(ClassScope scope, Method method, TextOutput out) {
+  void write(@NotNull ClassScope scope, @NotNull Method method, @NotNull TextOutput out) {
     MethodHandler.writeMethodDeclarationJava(out, method, paramNames);
     out.openBlock();
     out.append("return ");
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
index c51ae4c55e0f..71150f1fad79 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderGenerator.java
@@ -121,6 +121,7 @@ public final class ReaderGenerator {
     out.append("// Generated source");
     out.newLine().append("package ").append(configuration.packageName).append(';');
     out.newLine().newLine().append("import org.jetbrains.jsonProtocol.*;");
+    out.newLine().newLine().append("import org.jetbrains.annotations.NotNull;");
     out.newLine().newLine().append("import static org.jetbrains.jsonProtocol.JsonReaders.*;");
     out.newLine().newLine().append("public final class ").append(configuration.className).space();
     out.append(configuration.root.getType().isInterface() ? "implements" : "extends").space().append(configuration.root.getType().getCanonicalName()).openBlock(false);
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
index f7ce9eb9eb39..8a480f9ec819 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java
@@ -94,11 +94,11 @@ class ReaderRoot<R> {
     return rootClass;
   }
 
-  public void writeStaticMethodJava(ClassScope scope) {
+  public void writeStaticMethodJava(@NotNull ClassScope scope) {
     TextOutput out = scope.getOutput();
-    for (Map.Entry<Method, ReadDelegate> en : methodMap.entrySet()) {
+    for (Map.Entry<Method, ReadDelegate> entry : methodMap.entrySet()) {
       out.newLine();
-      en.getValue().write(scope, en.getKey(), out);
+      entry.getValue().write(scope, entry.getKey(), out);
       out.newLine();
     }
   }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
index 261b0e94e07c..983ce0c69d01 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TypeHandler.java
@@ -93,9 +93,9 @@ class TypeHandler<T> {
       subtypeAspect.writeParseMethod(valueImplClassName, classScope, out);
     }
 
-    for (Map.Entry<Method, MethodHandler> en : methodHandlerMap.entrySet()) {
+    for (Map.Entry<Method, MethodHandler> entry : methodHandlerMap.entrySet()) {
       out.newLine();
-      en.getValue().writeMethodImplementationJava(classScope, en.getKey(), out);
+      entry.getValue().writeMethodImplementationJava(classScope, entry.getKey(), out);
       out.newLine();
     }
 
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index e5be37cd7b30..d9f47ad0209a 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -51,7 +51,7 @@ ide.debugger.inline.dark.fg.color=61,128,101
 ide.debugger.inline.dark.fg.color.description=Inline values foreground for dark editor scheme
 ide.debugger.inline.fg.modified.color=202,128,33
 ide.debugger.inline.fg.modified.color.description=Inline modified values foreground
-ide.debugger.inline.dark.fg.modified.color=161,131,10
+ide.debugger.inline.dark.fg.modified.color=202,126,3
 ide.debugger.inline.dark.fg.modified.color.description=Inline modified values foreground for dark editor scheme
 
 ide.debugMode.description=Record additional information to make bug reports more informative.
@@ -198,6 +198,9 @@ compiler.process.use.memory.temp.cache=true
 compiler.process.use.memory.temp.cache.description=Store temporary data in memory for faster compilation;\
    requires larger heap size for the build process. If parallel build is enabled, the option is ignored and temp data is always stored in memory.
 
+compiler.process.preload=false
+compiler.process.preload.description=After build finishes, the IDE will pre-load and leave waiting in memory the build process for the next compilation. This will save time for process start and project model loading (may be noticeable for big projects).\
+   
 compiler.process.debug.port=-1
 
 compiler.automake.trigger.delay=300
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index cdf7fda9c9c0..43dd68c2c370 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -482,6 +482,7 @@ public class AllIcons {
     public static final Icon Reset = IconLoader.getIcon("/general/reset.png"); // 16x16
     public static final Icon Run = IconLoader.getIcon("/general/run.png"); // 7x10
     public static final Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); // 16x16
+    public static final Icon SearchEverywhereGear = IconLoader.getIcon("/general/searchEverywhereGear.png"); // 12x12
     public static final Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); // 16x16
     public static final Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); // 17x11
     public static final Icon Settings = IconLoader.getIcon("/general/settings.png"); // 16x16
diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
index 5dbe2dd1ae76..1669c5eca11a 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
@@ -18,6 +18,8 @@ package com.intellij.openapi.util.io;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
+import com.intellij.util.ObjectUtils;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -236,6 +238,34 @@ public class IoTestUtil {
     return jarFile;
   }
 
+  @NotNull
+  public static File createTestJar(@NotNull File jarFile, @NotNull final File root) throws IOException {
+    final ZipOutputStream stream = new ZipOutputStream(new FileOutputStream(jarFile));
+    try {
+      FileUtil.visitFiles(root, new Processor<File>() {
+        @Override
+        public boolean process(File file) {
+          if (file.isFile()) {
+            String path = FileUtil.toSystemIndependentName(ObjectUtils.assertNotNull(FileUtil.getRelativePath(root, file)));
+            try {
+              stream.putNextEntry(new ZipEntry(path));
+              stream.write(FileUtil.loadFileBytes(file));
+              stream.closeEntry();
+            }
+            catch (IOException e) {
+              throw new RuntimeException(e);
+            }
+          }
+          return true;
+        }
+      });
+    }
+    finally {
+      stream.close();
+    }
+    return jarFile;
+  }
+
   @NotNull
   public static File createTestDir(@NotNull String name) {
     return createTestDir(new File(FileUtil.getTempDirectory()), name);
diff --git a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
index 4268ce9fc1bb..01046586dc5d 100644
--- a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
@@ -38,7 +38,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testBasics() throws ParseException {
-    Clock.setTime(2004, 11, 10, 17, 10);
+    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 10);
 
     doTestPrettyDate("Today", "10.12.2004 17.00.00");
     doTestPrettyDate("Today", "10.12.2004 00.00.00");
@@ -49,7 +49,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testTime() throws Exception {
-    Clock.setTime(2004, 11, 10, 17, 10, 15);
+    Clock.setTime(1980, Calendar.DECEMBER, 10, 17, 10, 15);
 
     if (SystemInfo.isMac) {
       assertEquals("17:10", DateFormatUtil.formatTime(Clock.getTime()));
@@ -60,7 +60,7 @@ public class DateFormatUtilTest {
       assertEquals("17:10:15", printTimeForLocale("de_DE.UTF-8", Clock.getTime()));
     }
     else if (SystemInfo.isWinVistaOrNewer) {
-      long time = new Date().getTime();
+      long time = Clock.getTime();
       assertEquals(printWindowsTime(time), DateFormatUtil.formatTimeWithSeconds(time));
     }
     else {
@@ -73,7 +73,7 @@ public class DateFormatUtilTest {
 
   @Test
   public void testPrettyDateTime() throws ParseException {
-    Clock.setTime(2004, 11, 10, 17, 0);
+    Clock.setTime(2004, Calendar.DECEMBER, 10, 17, 0);
     doTestDateTime("Moments ago", "10.12.2004 16.59.31");
     doTestDateTime("A minute ago", "10.12.2004 16.59.29");
     doTestDateTime("5 minutes ago", "10.12.2004 16.55.00");
@@ -82,7 +82,7 @@ public class DateFormatUtilTest {
     doTestDateTime("Yesterday " + DateFormatUtil.formatTime(DATE_FORMAT.parse("09.12.2004 15.00.00")), "09.12.2004 15.00.00");
     doTestDateTime("Today " + DateFormatUtil.formatTime(DATE_FORMAT.parse("10.12.2004 19.00.00")), "10.12.2004 19.00.00");
 
-    Clock.setTime(2004, 0, 1, 15, 53);
+    Clock.setTime(2004, Calendar.JANUARY, 1, 15, 53);
     doTestDateTime(DateFormatUtil.formatDateTime(DATE_FORMAT.parse("01.01.2003 15.53.00")), "01.01.2003 15.53.00");
     doTestDateTime("Yesterday " + DateFormatUtil.formatTime(DATE_FORMAT.parse("31.12.2003 15.00.00")), "31.12.2003 15.00.00");
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
index 297408c3ec24..7801b7f80b45 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
@@ -19,6 +19,7 @@ package com.intellij.openapi.vcs.changes.ui;
 import com.intellij.icons.AllIcons;
 import com.intellij.lifecycle.PeriodicalTasksCloser;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.AbstractProjectComponent;
@@ -26,6 +27,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
@@ -36,6 +38,7 @@ import com.intellij.openapi.vcs.VcsListener;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.ui.content.*;
 import com.intellij.util.Alarm;
 import com.intellij.util.NotNullFunction;
@@ -83,6 +86,10 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
         if (toolWindowManager != null) {
           myToolWindow = toolWindowManager.registerToolWindow(TOOLWINDOW_ID, true, ToolWindowAnchor.BOTTOM, myProject, true);
           myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowChanges);
+          DefaultActionGroup gearActions = new DefaultActionGroup();
+          gearActions.addAction(SimpleToolWindowPanel.createToggleToolbarAction(myProject, myToolWindow)).setAsSecondary(true);
+          ((ToolWindowEx)myToolWindow).setAdditionalGearActions(gearActions);
+
           updateToolWindowAvailability();
           final ContentManager contentManager = myToolWindow.getContentManager();
           myContentManagerListener = new MyContentManagerListener();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
index 07de0c4404e4..4bd2cb5c6aef 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java
@@ -33,7 +33,7 @@ public class VcsLimitHistoryConfigurable extends VcsCheckBoxWithSpinnerConfigura
   private final VcsConfiguration myConfiguration;
 
   public VcsLimitHistoryConfigurable(Project project) {
-    super(project, "Limit history by: ", "rows");
+    super(project, "Limit history to: ", "rows");
     myConfiguration = VcsConfiguration.getInstance(myProject);
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 84ca76e1d89f..45f550271825 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -243,6 +243,12 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
         else {
           myContentManager = ContentFactory.SERVICE.getInstance().createContentManager(true, myProject);
         }
+      }
+    });
+
+    addInitializationRequest(VcsInitObject.AFTER_COMMON, new Runnable() {
+      @Override
+      public void run() {
         if (!ApplicationManager.getApplication().isUnitTestMode()) {
           VcsRootChecker[] checkers = Extensions.getExtensions(VcsRootChecker.EXTENSION_POINT_NAME);
           if (checkers.length != 0) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
index fcafc513fcb8..c720834fa594 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
@@ -21,19 +21,26 @@ import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsDirectoryMapping;
 import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.openapi.vcs.VcsRootError;
+import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.event.HyperlinkEvent;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 
 import static com.intellij.openapi.util.text.StringUtil.pluralize;
 
@@ -44,11 +51,14 @@ import static com.intellij.openapi.util.text.StringUtil.pluralize;
  */
 public class VcsRootProblemNotifier {
 
-  private final @NotNull Project myProject;
-  private final @NotNull VcsConfiguration mySettings;
+  @NotNull private final Project myProject;
+  @NotNull private final VcsConfiguration mySettings;
+  @NotNull private final ChangeListManager myChangeListManager;
 
-  private @Nullable Notification myNotification;
-  private final @NotNull Object NOTIFICATION_LOCK = new Object();
+  @NotNull private final Set<VcsRootError> myReportedUnregisteredRoots = ContainerUtil.newHashSet();
+
+  @Nullable private Notification myNotification;
+  @NotNull private final Object NOTIFICATION_LOCK = new Object();
 
   public static VcsRootProblemNotifier getInstance(@NotNull Project project) {
     return new VcsRootProblemNotifier(project);
@@ -57,6 +67,7 @@ public class VcsRootProblemNotifier {
   private VcsRootProblemNotifier(@NotNull Project project) {
     myProject = project;
     mySettings = VcsConfiguration.getInstance(myProject);
+    myChangeListManager = ChangeListManager.getInstance(project);
   }
 
   public void rescanAndNotifyIfNeeded() {
@@ -73,8 +84,14 @@ public class VcsRootProblemNotifier {
     }
 
     Collection<VcsRootError> unregisteredRoots = getUnregisteredRoots(errors);
+    Collection<VcsRootError> important = getImportantMappings(unregisteredRoots);
     Collection<VcsRootError> invalidRoots = getInvalidRoots(errors);
 
+    if (invalidRoots.isEmpty() && (important.isEmpty() || myReportedUnregisteredRoots.containsAll(important))) {
+      return;
+    }
+    myReportedUnregisteredRoots.addAll(unregisteredRoots);
+
     String title = makeTitle(unregisteredRoots, invalidRoots);
     String description = makeDescription(unregisteredRoots, invalidRoots);
 
@@ -88,6 +105,26 @@ public class VcsRootProblemNotifier {
     }
   }
 
+  @NotNull
+  private List<VcsRootError> getImportantMappings(@NotNull Collection<VcsRootError> unregisteredRoots) {
+    return ContainerUtil.filter(unregisteredRoots, new Condition<VcsRootError>() {
+      @Override
+      public boolean value(VcsRootError error) {
+        String mapping = error.getMapping();
+        return isUnderProjectDir(mapping) && !isIgnored(mapping);
+      }
+    });
+  }
+
+  private boolean isUnderProjectDir(@NotNull String mapping) {
+    return mapping.equals(VcsDirectoryMapping.PROJECT_CONSTANT) || FileUtil.isAncestor(myProject.getBasePath(), mapping, false);
+  }
+
+  private boolean isIgnored(@NotNull String mapping) {
+    VirtualFile file = LocalFileSystem.getInstance().findFileByPath(mapping);
+    return file != null && myChangeListManager.isIgnoredFile(file);
+  }
+
   private void expireNotification() {
     if (myNotification != null) {
       final Notification notification = myNotification;
@@ -125,19 +162,13 @@ public class VcsRootProblemNotifier {
     if (!invalidRoots.isEmpty()) {
       if (invalidRoots.size() == 1) {
         VcsRootError rootError = invalidRoots.iterator().next();
-        description
-          .append("The directory " +
-                  rootToDisplayableString.fun(rootError) +
-                  " is registered as a " +
-                  rootError.getVcsKey().getName() +
-                  " root, " +
-                  "but no " +
-                  rootError.getVcsKey().getName() +
-                  " repositories were found there.");
+        String vcsName = rootError.getVcsKey().getName();
+        description.append(String.format("The directory %s is registered as a %s root, but no %s repositories were found there.",
+                                         rootToDisplayableString.fun(rootError), vcsName, vcsName));
       }
       else {
-        description.append("The following directories are registered as Vcs roots, but they are not: <br/>" +
-                           StringUtil.join(invalidRoots, rootToDisplayableString, ", "));
+        description.append("The following directories are registered as VCS roots, but they are not: <br/>" +
+                           StringUtil.join(invalidRoots, rootToDisplayableString, "<br/>"));
       }
       description.append("<br/>");
     }
@@ -145,17 +176,12 @@ public class VcsRootProblemNotifier {
     if (!unregisteredRoots.isEmpty()) {
       if (unregisteredRoots.size() == 1) {
         VcsRootError unregisteredRoot = unregisteredRoots.iterator().next();
-        description
-          .append("The directory " +
-                  rootToDisplayableString.fun(unregisteredRoot) +
-                  " is under " +
-                  unregisteredRoot.getVcsKey().getName() +
-                  ", " +
-                  "but is not registered in the Settings.");
+        description.append(String.format("The directory %s is under %s, but is not registered in the Settings.",
+                                         rootToDisplayableString.fun(unregisteredRoot), unregisteredRoot.getVcsKey().getName()));
       }
       else {
-        description.append("The following directories are roots of Vcs repositories, but they are not registered in the Settings: <br/>" +
-                           StringUtil.join(unregisteredRoots, rootToDisplayableString, ", "));
+        description.append("The following directories are roots of VCS repositories, but they are not registered in the Settings: <br/>" +
+                           StringUtil.join(unregisteredRoots, rootToDisplayableString, "<br/>"));
       }
       description.append("<br/>");
     }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
index 8ee2f551fd80..b052d0bd78ff 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootScanner.java
@@ -16,11 +16,9 @@
 package com.intellij.openapi.vcs.roots;
 
 import com.intellij.ProjectTopics;
-import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootEvent;
 import com.intellij.openapi.roots.ModuleRootListener;
-import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsListener;
 import com.intellij.openapi.vcs.VcsRootChecker;
@@ -34,36 +32,22 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * @author Nadya Zabrodina
- */
 public class VcsRootScanner implements BulkFileListener, ModuleRootListener, VcsListener {
 
   @NotNull private final VcsRootProblemNotifier myRootProblemNotifier;
   @NotNull private final VcsRootChecker[] myCheckers;
 
-  private volatile boolean myProjectIsInitialized;
-  private volatile boolean myMappingsAreReady;
-
   @NotNull private final Alarm myAlarm;
   private static final long WAIT_BEFORE_SCAN = TimeUnit.SECONDS.toMillis(1);
 
   public static void start(@NotNull Project project, @NotNull VcsRootChecker[] checkers) {
-    new VcsRootScanner(project, checkers);
+    new VcsRootScanner(project, checkers).scheduleScan();
   }
 
   private VcsRootScanner(@NotNull Project project, @NotNull VcsRootChecker[] checkers) {
     myRootProblemNotifier = VcsRootProblemNotifier.getInstance(project);
     myCheckers = checkers;
 
-    StartupManager.getInstance(project).runWhenProjectIsInitialized(new DumbAwareRunnable() {
-      @Override
-      public void run() {
-        myProjectIsInitialized = true;
-        scanIfReady();
-      }
-    });
-
     final MessageBus messageBus = project.getMessageBus();
     messageBus.connect().subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, this);
     messageBus.connect().subscribe(VirtualFileManager.VFS_CHANGES, this);
@@ -82,7 +66,7 @@ public class VcsRootScanner implements BulkFileListener, ModuleRootListener, Vcs
       String filePath = event.getPath();
       for (VcsRootChecker checker : myCheckers) {
         if (checker.isVcsDir(filePath)) {
-          scanIfReady();
+          scheduleScan();
           break;
         }
       }
@@ -95,23 +79,12 @@ public class VcsRootScanner implements BulkFileListener, ModuleRootListener, Vcs
 
   @Override
   public void rootsChanged(ModuleRootEvent event) {
-    scanIfReady();
+    scheduleScan();
   }
 
   @Override
   public void directoryMappingChanged() {
-    myMappingsAreReady = true;
-    scanIfReady();
-  }
-
-  private void scanIfReady() {
-    if (readyToScan()) {
-      scheduleScan();
-    }
-  }
-
-  private boolean readyToScan() {
-    return myMappingsAreReady && myProjectIsInitialized;
+    scheduleScan();
   }
 
   private void scheduleScan() {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
index 1f8d636d1fab..a71b6ec5de7a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEditorLinePainter.java
@@ -26,7 +26,10 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.*;
+import com.intellij.ui.ColorUtil;
+import com.intellij.ui.JBColor;
+import com.intellij.ui.SimpleColoredText;
+import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.NotNullProducer;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XSourcePosition;
@@ -79,7 +82,7 @@ public class XDebuggerEditorLinePainter extends EditorLinePainter {
         final XValuePresentation presentation = value.getValuePresentation();
         if (presentation == null) continue;
         try {
-          if (presentation instanceof XValueCompactPresentation) {
+          if (presentation instanceof XValueCompactPresentation && !value.getTree().isUnderRemoteDebug()) {
             ((XValueCompactPresentation)presentation).renderValue(renderer, value);
           }
           else {
@@ -95,7 +98,7 @@ public class XDebuggerEditorLinePainter extends EditorLinePainter {
         catch (Exception e) {
           continue;
         }
-        final Color color = bpLine == lineNumber ? new JBColor(Gray._180, new Color(147, 217, 186)) : getForeground();
+        final Color color = bpLine == lineNumber ? new JBColor(new Color(0, 255, 86), new Color(255, 235, 9)) : getForeground();
 
         final String name = value.getName();
         if (StringUtil.isEmpty(text.toString())) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
index 84e391b21a1a..1edfa484421a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
@@ -89,6 +89,10 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
 
   protected abstract Project getProject();
 
+  private static void setInplaceEditorBounds(JComponent component, int x, int y, int width, int height) {
+    component.setBounds(x, y, width, Math.max(height, component.getPreferredSize().height));
+  }
+
   public final void show() {
     LOG.assertTrue(myInplaceEditorComponent == null, "editor is not released");
     final JTree tree = getTree();
@@ -108,12 +112,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     final JComponent inplaceEditorComponent = createInplaceEditorComponent();
     myInplaceEditorComponent = inplaceEditorComponent;
     LOG.assertTrue(inplaceEditorComponent != null);
-    inplaceEditorComponent.setBounds(
-      layeredPanePoint.x,
-      layeredPanePoint.y,
-      bounds.width,
-      Math.max(bounds.height, inplaceEditorComponent.getPreferredSize().height)
-    );
+    setInplaceEditorBounds(inplaceEditorComponent, layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
 
     layeredPane.add(inplaceEditorComponent, new Integer(250));
 
@@ -145,7 +144,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
               return;
             }
             Point layeredPanePoint = SwingUtilities.convertPoint(tree, bounds.x, bounds.y, layeredPane);
-            inplaceEditorComponent.setBounds(layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
+            setInplaceEditorBounds(inplaceEditorComponent, layeredPanePoint.x, layeredPanePoint.y, bounds.width, bounds.height);
             inplaceEditorComponent.revalidate();
           }
         });
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
index 91de065a12d8..feb62d3c03df 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
@@ -15,6 +15,9 @@
  */
 package com.intellij.xdebugger.impl.ui.tree;
 
+import com.intellij.execution.configurations.RemoteRunProfile;
+import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.ide.DataManager;
 import com.intellij.ide.dnd.aware.DnDAwareTree;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
@@ -226,6 +229,15 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposa
   private void updateEditor() {
     myAlarm.cancelAndRequest();
   }
+  
+  public boolean isUnderRemoteDebug() {
+    DataContext context = DataManager.getInstance().getDataContext(this);
+    ExecutionEnvironment env = LangDataKeys.EXECUTION_ENVIRONMENT.getData(context);
+    if (env != null && env.getRunProfile() instanceof RemoteRunProfile) {
+      return true;
+    }
+    return false;
+  }
 
   private boolean expandIfEllipsis() {
     MessageTreeNode[] treeNodes = getSelectedNodes(MessageTreeNode.class, null);
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
index 2f9d60d11785..6c175f52d6a6 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
@@ -15,12 +15,9 @@
  */
 package com.intellij.xdebugger.impl.ui.tree.nodes;
 
-import com.intellij.execution.configurations.RemoteRunProfile;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfile;
-import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.SimpleTextAttributes;
@@ -121,13 +118,11 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
   }
 
   private static boolean isUseGetChildrenHack(@NotNull XDebuggerTree tree) {
-    DataContext context = DataManager.getInstance().getDataContext(tree);
-    ExecutionEnvironment env = LangDataKeys.EXECUTION_ENVIRONMENT.getData(context);
-    if (env != null && env.getRunProfile() instanceof RemoteRunProfile) {
+    if (tree.isUnderRemoteDebug()) {
       return false;
     }
 
-    RunProfile runProfile = LangDataKeys.RUN_PROFILE.getData(context);
+    RunProfile runProfile = LangDataKeys.RUN_PROFILE.getData(DataManager.getInstance().getDataContext(tree));
     return !(runProfile instanceof RunConfiguration && ((RunConfiguration)runProfile).getType().getDisplayName().startsWith("JavaScript"));
   }
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
index 7020c9a5cf84..6f911b28cd68 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
@@ -160,10 +160,11 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
           };
 
           if (getValueContainer().computeInlineDebuggerData(callback) == ThreeState.UNSURE) {
-            getValueContainer().computeSourcePosition(new XNearestSourcePosition() {
+            class ValueDeclaration implements XNavigatable {
               @Override
               public void setSourcePosition(@Nullable XSourcePosition sourcePosition) {
-                final Map<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>> map = myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES);
+                final Map<Pair<VirtualFile, Integer>, Set<XValueNodeImpl>> map =
+                  myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES);
                 final Map<VirtualFile, Long> timestamps = myTree.getProject().getUserData(XVariablesView.DEBUG_VARIABLES_TIMESTAMPS);
                 if (map == null || timestamps == null || sourcePosition == null) return;
                 VirtualFile file = sourcePosition.getFile();
@@ -172,7 +173,10 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
                 int line = sourcePosition.getLine();
                 callback.computed(file, doc, line);
               }
-            });
+            }
+            class NearestValuePosition extends ValueDeclaration implements XNearestSourcePosition {}
+            getValueContainer().computeSourcePosition(new ValueDeclaration());
+            getValueContainer().computeSourcePosition(new NearestValuePosition());
           }
         }
       }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
index 9118a798f612..3da2504df69a 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.refactoring.util.RefactoringChangeUtil;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
@@ -243,12 +244,9 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
       if (!(expression instanceof PsiMethodCallExpression)) {
         return false;
       }
-      final PsiMethodCallExpression methodCallExpression =
-        (PsiMethodCallExpression)expression;
-      final PsiReferenceExpression methodExpression =
-        methodCallExpression.getMethodExpression();
-      final PsiExpression qualifier =
-        methodExpression.getQualifierExpression();
+      final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression;
+      final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+      final PsiExpression qualifier = methodExpression.getQualifierExpression();
       if (qualifier == null) {
         return false;
       }
@@ -261,31 +259,45 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
         return false;
       }
       final String methodName = methodExpression.getReferenceName();
-      final String unboxingMethod =
-        s_unboxingMethods.get(qualifierTypeName);
+      final String unboxingMethod = s_unboxingMethods.get(qualifierTypeName);
       return unboxingMethod.equals(methodName);
     }
 
-    private boolean isSameMethodCalledWithoutUnboxing(
-      @NotNull PsiCallExpression callExpression,
-      @NotNull PsiMethodCallExpression unboxingExpression) {
-      final PsiExpressionList argumentList =
-        callExpression.getArgumentList();
+    private boolean isSameMethodCalledWithoutUnboxing(@NotNull PsiCallExpression callExpression,
+                                                      @NotNull PsiMethodCallExpression unboxingExpression) {
+      final PsiExpressionList argumentList = callExpression.getArgumentList();
       if (argumentList == null) {
         return false;
       }
       final PsiExpression[] expressions = argumentList.getExpressions();
-      final PsiMethod originalMethod =
-        callExpression.resolveMethod();
+      final PsiMethod originalMethod = callExpression.resolveMethod();
       if (originalMethod == null) {
         return false;
       }
       final String name = originalMethod.getName();
-      final PsiClass containingClass =
-        originalMethod.getContainingClass();
+
+      final PsiExpression qualifierExpression;
+      if (callExpression instanceof PsiMethodCallExpression) {
+        qualifierExpression = ((PsiMethodCallExpression)callExpression).getMethodExpression().getQualifierExpression();
+      } else if (callExpression instanceof PsiNewExpression) {
+        qualifierExpression = ((PsiNewExpression)callExpression).getQualifier();
+      } else {
+        return false;
+      }
+
+      final PsiClass containingClass;
+      if (qualifierExpression == null) {
+        final PsiElement scope = callExpression.resolveMethodGenerics().getCurrentFileResolveScope();
+        containingClass = scope instanceof PsiClass ? (PsiClass)scope : null;
+      }
+      else {
+        containingClass = PsiUtil.resolveClassInType(GenericsUtil.getVariableTypeByExpressionType(qualifierExpression.getType()));
+      }
+
       if (containingClass == null) {
         return false;
       }
+
       final PsiType[] types = PsiType.createArray(expressions.length);
       for (int i = 0; i < expressions.length; i++) {
         final PsiExpression expression = expressions[i];
@@ -294,20 +306,17 @@ public class UnnecessaryUnboxingInspection extends BaseInspection {
           if (!(type instanceof PsiPrimitiveType)) {
             return false;
           }
-          final PsiPrimitiveType primitiveType =
-            (PsiPrimitiveType)type;
+          final PsiPrimitiveType primitiveType = (PsiPrimitiveType)type;
           types[i] = primitiveType.getBoxedType(unboxingExpression);
         }
         else {
           types[i] = type;
         }
       }
-      final PsiMethod[] methods =
-        containingClass.findMethodsByName(name, true);
+      final PsiMethod[] methods = containingClass.findMethodsByName(name, true);
       for (final PsiMethod method : methods) {
         if (!originalMethod.equals(method)) {
-          if (MethodCallUtils.isApplicable(method,
-                                           PsiSubstitutor.EMPTY, types)) {
+          if (MethodCallUtils.isApplicable(method, PsiSubstitutor.EMPTY, types)) {
             return false;
           }
         }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
index 96d22a045a7a..e2a096e059ca 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_superfluous_unboxing/UnnecessaryUnboxing.java
@@ -38,4 +38,19 @@ public class UnnecessaryUnboxing {
     Integer boxcutter(Integer i) {
       return i.intValue();
     }
+}
+
+
+class B23 {
+    public void set(double value) {}
+}
+class A23 extends B23 {
+    public void set(Object value) {}
+    private A23() {
+        Object o = 2d;
+        set(((Double) o).doubleValue());
+
+        B23 b23 = new B23();
+        b23.set(((Double) o).doubleValue());
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
index 366d21ddbae8..414960e321d6 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/UnnecessaryUnboxing.java
@@ -43,4 +43,17 @@ public class UnnecessaryUnboxing {
     byte cast(Integer v) {
        return (byte)v.intValue();
     }
+}
+
+
+class B23 {
+    public void set(double value) {}
+}
+class A23 extends B23 {
+    public void set(Object value) {}
+    private A23() {
+        Object o = 2d;
+        B23 b23 = new B23();
+        b23.set(((Double) o).doubleValue());
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
index 35c78be16577..d208b3f7867a 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/migration/unnecessary_unboxing/expected.xml
@@ -55,5 +55,10 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary unboxing</problem_class>
     <description>Unnecessary unboxing &lt;code&gt;b.byteValue()&lt;/code&gt; #loc</description>
   </problem>
-
+  <problem>
+    <file>UnnecessaryUnboxing.java</file>
+    <line>57</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary unboxing</problem_class>
+    <description>Unnecessary unboxing &lt;code&gt;((Double) o).doubleValue()&lt;/code&gt; #loc</description>
+  </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
index e191bd8aeee3..2ce1c27e6e38 100644
--- a/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
+++ b/plugins/devkit/src/references/extensions/ExtensionPointDocumentationProvider.java
@@ -15,21 +15,22 @@
  */
 package org.jetbrains.idea.devkit.references.extensions;
 
+import com.intellij.codeInsight.javadoc.JavaDocInfoGenerator;
 import com.intellij.lang.documentation.DocumentationProviderEx;
 import com.intellij.lang.java.JavaDocumentationProvider;
-import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.pom.PomTarget;
+import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTypesUtil;
 import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.util.xml.DomElement;
+import com.intellij.util.xml.DomTarget;
 import com.intellij.util.xml.DomUtil;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.devkit.dom.Extension;
 import org.jetbrains.idea.devkit.dom.ExtensionPoint;
 import org.jetbrains.idea.devkit.util.DescriptorUtil;
 
@@ -40,44 +41,61 @@ public class ExtensionPointDocumentationProvider extends DocumentationProviderEx
 
   @Override
   public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) {
-    ExtensionPoint extensionPoint = findExtensionPoint(originalElement);
+    ExtensionPoint extensionPoint = findExtensionPoint(element);
     if (extensionPoint == null) return null;
 
     final XmlFile epDeclarationFile = (XmlFile)extensionPoint.getXmlTag().getContainingFile();
     final Module epModule = ModuleUtilCore.findModuleForFile(epDeclarationFile.getVirtualFile(), element.getProject());
-    final PsiClass epClass = getExtensionPointClass(extensionPoint);
     final String epPrefix = extensionPoint.getNamePrefix();
-    return
-      (epModule == null ? "" : "[" + epModule.getName() + "]") +
-      (epPrefix == null ? "" : " " + epPrefix) +
-      "\n" +
-      "<b>" + extensionPoint.getEffectiveName() + "</b>" +
-      " [" + epDeclarationFile.getName() + "]\n" +
-      (epClass == null ? "<unknown>" : epClass.getQualifiedName());
+
+    final PsiClass epClass = getExtensionPointClass(extensionPoint);
+    StringBuilder epClassText = new StringBuilder();
+    if (epClass != null) {
+      JavaDocInfoGenerator.generateType(epClassText, PsiTypesUtil.getClassType(epClass), epClass, true);
+    }
+    else {
+      epClassText.append("<unknown>");
+    }
+
+    return (epModule == null ? "" : "[" + epModule.getName() + "]") +
+           (epPrefix == null ? "" : " " + epPrefix) +
+           "<br/>" +
+           "<b>" + extensionPoint.getEffectiveName() + "</b>" +
+           " [" + epDeclarationFile.getName() + "]<br/>" +
+           epClassText.toString();
   }
 
   @Override
   public String generateDoc(PsiElement element, @Nullable PsiElement originalElement) {
-    ExtensionPoint extensionPoint = findExtensionPoint(originalElement);
+    ExtensionPoint extensionPoint = findExtensionPoint(element);
     if (extensionPoint == null) return null;
 
     final PsiClass epClass = getExtensionPointClass(extensionPoint);
     if (epClass != null) {
-      return JavaDocumentationProvider.generateExternalJavadoc(epClass);
+      StringBuilder sb = new StringBuilder();
+      sb.append("<em>EP Definition</em><br/>");
+      final String quickInfo = StringUtil.notNullize(getQuickNavigateInfo(element, originalElement));
+      sb.append(quickInfo);
+      sb.append("<br/>");
+      sb.append("<br/>");
+      sb.append("<em>EP Implementation</em>");
+      sb.append(JavaDocumentationProvider.generateExternalJavadoc(epClass));
+
+      return sb.toString();
     }
     return null;
   }
 
   @Nullable
-  private static ExtensionPoint findExtensionPoint(@Nullable PsiElement element) {
-    if (element == null) return null;
-    if (element.getLanguage() == XMLLanguage.INSTANCE &&
-        (element instanceof XmlTag ||
-         element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME) &&
+  private static ExtensionPoint findExtensionPoint(PsiElement element) {
+    if (element instanceof PomTargetPsiElement &&
         DescriptorUtil.isPluginXml(element.getContainingFile())) {
-      final DomElement domElement = DomUtil.getDomElement(element);
-      if (domElement instanceof Extension) {
-        return ((Extension)domElement).getExtensionPoint();
+      final PomTarget pomTarget = ((PomTargetPsiElement)element).getTarget();
+      if (pomTarget instanceof DomTarget) {
+        final DomElement domElement = ((DomTarget)pomTarget).getDomElement();
+        if (domElement instanceof ExtensionPoint) {
+          return (ExtensionPoint)domElement;
+        }
       }
     }
     return null;
diff --git a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy
deleted file mode 100644
index 6a3a89997b8d..000000000000
--- a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.idea.devkit.references.extensions
-import com.intellij.codeInsight.documentation.DocumentationManager
-import com.intellij.lang.documentation.DocumentationProvider
-import com.intellij.openapi.application.PluginPathManager
-import com.intellij.pom.PomTargetPsiElement
-import com.intellij.psi.PsiElement
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
-import com.intellij.util.ui.UIUtil
-import com.intellij.util.xml.DomTarget
-
-class ExtensionPointDocumentationProviderTest extends LightCodeInsightFixtureTestCase {
-
-  @Override
-  String getBasePath() {
-    return PluginPathManager.getPluginHomePathRelative("devkit") + "/testData/references/extensions"
-  }
-
-  void testExtensionPointDocumentation() {
-    myFixture.configureByFiles("extensionPointDocumentation.xml",
-                               "bar/MyExtensionPoint.java")
-
-    PsiElement originalElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset())
-    PomTargetPsiElement pomTargetPsiElement = assertInstanceOf(myFixture.getElementAtCaret(), PomTargetPsiElement.class)
-    DomTarget domTarget = assertInstanceOf(pomTargetPsiElement.getTarget(), DomTarget.class)
-    PsiElement epPsiElement = domTarget.getNavigationElement()
-
-    DocumentationProvider provider = DocumentationManager.getProviderFromElement(epPsiElement)
-    String docBody = UIUtil.getHtmlBody(provider.generateDoc(epPsiElement, originalElement))
-    assertEquals("""<small><b>bar</b></small><PRE>public interface <b>MyExtensionPoint</b></PRE>
-   MyExtensionPoint JavaDoc.""", docBody)
-
-    assertEquals("""[$myModule.name] foo
-<b>bar</b> [extensionPointDocumentation.xml]
-bar.MyExtensionPoint""", provider.getQuickNavigateInfo(epPsiElement, originalElement))
-  }
-}
\ No newline at end of file
diff --git a/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
new file mode 100644
index 000000000000..a9c16ec0335a
--- /dev/null
+++ b/plugins/devkit/testSources/references/extensions/ExtensionPointDocumentationProviderTest.java
@@ -0,0 +1,40 @@
+package org.jetbrains.idea.devkit.references.extensions;
+
+import com.intellij.codeInsight.documentation.DocumentationManager;
+import com.intellij.lang.documentation.DocumentationProvider;
+import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.psi.PsiElement;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+
+public class ExtensionPointDocumentationProviderTest extends LightCodeInsightFixtureTestCase {
+  @Override
+  public String getBasePath() {
+    return PluginPathManager.getPluginHomePathRelative("devkit") + "/testData/references/extensions";
+  }
+
+  public void testExtensionPointDocumentation() {
+    myFixture.configureByFiles("extensionPointDocumentation.xml", "bar/MyExtensionPoint.java");
+
+    final PsiElement docElement =
+      DocumentationManager.getInstance(getProject()).findTargetElement(myFixture.getEditor(),
+                                                                       myFixture.getFile());
+    DocumentationProvider provider = DocumentationManager.getProviderFromElement(docElement);
+
+    String epDefinition = "[" + myModule.getName() + "] foo<br/>" +
+                          "<b>bar</b> " +
+                          "[extensionPointDocumentation.xml]<br/>" +
+                          "<a href=\"psi_element://bar.MyExtensionPoint\"><code>MyExtensionPoint</code></a>";
+
+    assertEquals(epDefinition,
+                 provider.getQuickNavigateInfo(docElement, null));
+
+    assertEquals("<em>EP Definition</em><br/>" +
+                 epDefinition +
+                 "<br/><br/>" +
+                 "<em>EP Implementation</em>" +
+                 "<html><head>    <style type=\"text/css\">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head>" +
+                 "<body><small><b>bar</b></small><PRE>public interface <b>MyExtensionPoint</b></PRE>\n" +
+                 "   MyExtensionPoint JavaDoc.</body></html>",
+                 provider.generateDoc(docElement, null));
+  }
+}
diff --git a/plugins/git4idea/src/git4idea/actions/GitPushAction.java b/plugins/git4idea/src/git4idea/actions/GitPushAction.java
index 04e139fa8934..8340de21c560 100644
--- a/plugins/git4idea/src/git4idea/actions/GitPushAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitPushAction.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import git4idea.GitUtil;
-import git4idea.branch.GitBranchUtil;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
 import org.jetbrains.annotations.NotNull;
@@ -38,15 +37,15 @@ public class GitPushAction extends DumbAwareAction {
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
     Project project = e.getRequiredData(CommonDataKeys.PROJECT);
-    Collection<GitRepository> repositories = collectRepositories(project, e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY));
+    Collection<GitRepository> repositories = e.getData(CommonDataKeys.EDITOR) != null
+                                             ? ContainerUtil.<GitRepository>emptyList()
+                                             : collectRepositories(project, e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY));
     new VcsPushDialog(project, RepositoryUtil.sortRepositories(repositories)).show();
   }
 
   @NotNull
   private static Collection<GitRepository> collectRepositories(@NotNull Project project, @Nullable VirtualFile[] files) {
-    if (files == null) {
-      return Collections.singletonList(GitBranchUtil.getCurrentRepository(project));
-    }
+    if (files == null) return Collections.emptyList();
     GitRepositoryManager manager = GitUtil.getRepositoryManager(project);
     Collection<GitRepository> repositories = ContainerUtil.newHashSet();
     for (VirtualFile file : files) {
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
index 21a86a63ac41..300d0b9d1a1a 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
@@ -28,12 +28,12 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-class GitPushTagPanel extends VcsPushOptionsPanel {
+public class GitPushTagPanel extends VcsPushOptionsPanel {
 
   private final ComboBox myCombobox;
   private final JBCheckBox myCheckBox;
 
-  GitPushTagPanel(@Nullable GitPushTagMode defaultMode, boolean followTagsSupported) {
+  public GitPushTagPanel(@Nullable GitPushTagMode defaultMode, boolean followTagsSupported) {
     String checkboxText = "Push Tags";
     if (followTagsSupported) {
       checkboxText += ": ";
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTarget.java b/plugins/git4idea/src/git4idea/push/GitPushTarget.java
index 467c4e7448e4..4536973b9281 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTarget.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTarget.java
@@ -33,20 +33,20 @@ import java.util.Collection;
 
 import static git4idea.GitUtil.findRemoteBranch;
 
-class GitPushTarget implements PushTarget {
+public class GitPushTarget implements PushTarget {
 
   private static final Logger LOG = Logger.getInstance(GitPushTarget.class);
 
   @NotNull private final GitRemoteBranch myRemoteBranch;
   private final boolean myIsNewBranchCreated;
 
-  GitPushTarget(@NotNull GitRemoteBranch remoteBranch, boolean isNewBranchCreated) {
+  public GitPushTarget(@NotNull GitRemoteBranch remoteBranch, boolean isNewBranchCreated) {
     myRemoteBranch = remoteBranch;
     myIsNewBranchCreated = isNewBranchCreated;
   }
 
   @NotNull
-  GitRemoteBranch getBranch() {
+  public GitRemoteBranch getBranch() {
     return myRemoteBranch;
   }
 
@@ -55,12 +55,12 @@ class GitPushTarget implements PushTarget {
     return isNewBranchCreated();
   }
 
-  boolean isNewBranchCreated() {
+  public boolean isNewBranchCreated() {
     return myIsNewBranchCreated;
   }
 
   @NotNull
-  static GitPushTarget parse(@NotNull GitRepository repository, @Nullable String remoteName, @NotNull String branchName) throws
+  public static GitPushTarget parse(@NotNull GitRepository repository, @Nullable String remoteName, @NotNull String branchName) throws
                                                                                                                         ParseException {
     if (remoteName == null) {
       throw new ParseException("No remotes defined", -1);
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
index aa03697963c8..62ecbd670d4c 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
@@ -44,7 +44,7 @@ import java.text.ParseException;
 import java.util.Comparator;
 import java.util.List;
 
-class GitPushTargetPanel extends PushTargetPanel<GitPushTarget> {
+public class GitPushTargetPanel extends PushTargetPanel<GitPushTarget> {
 
   private static final Logger LOG = Logger.getInstance(GitPushTargetPanel.class);
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
index 038c1c24121f..d4d40d791bed 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
@@ -35,7 +35,7 @@ import java.util.List;
 public class HgUpdateEnvironment implements UpdateEnvironment {
 
   private final Project project;
-  private final HgUpdateConfigurationSettings updateConfiguration;
+  @NotNull private final HgUpdateConfigurationSettings updateConfiguration;
 
   public HgUpdateEnvironment(Project project) {
     this.project = project;
@@ -89,7 +89,7 @@ public class HgUpdateEnvironment implements UpdateEnvironment {
     private final HgUpdateConfigurationSettings updateConfiguration;
     protected HgUpdateDialog updateDialog;
 
-    public UpdateConfigurable(HgUpdateConfigurationSettings updateConfiguration) {
+    public UpdateConfigurable(@NotNull HgUpdateConfigurationSettings updateConfiguration) {
       this.updateConfiguration = updateConfiguration;
     }
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
index b05cde7fbd9f..e5539ef7c57e 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
@@ -15,14 +15,15 @@
  */
 package org.zmlx.hg4idea.push;
 
+import com.intellij.dvcs.branch.DvcsSyncSettings;
 import com.intellij.dvcs.push.*;
-import com.intellij.dvcs.repo.Repository;
 import com.intellij.dvcs.repo.RepositoryManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.zmlx.hg4idea.HgProjectSettings;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.repo.HgRepository;
 import org.zmlx.hg4idea.util.HgUtil;
@@ -31,10 +32,12 @@ public class HgPushSupport extends PushSupport<HgRepository, HgPushSource, HgTar
 
   @NotNull private final Project myProject;
   @NotNull private final HgVcs myVcs;
+  @NotNull private final HgProjectSettings mySettings;
 
   public HgPushSupport(@NotNull Project project) {
     myProject = project;
     myVcs = ObjectUtils.assertNotNull(HgVcs.getInstance(myProject));
+    mySettings = myVcs.getProjectSettings();
   }
 
   @NotNull
@@ -98,6 +101,7 @@ public class HgPushSupport extends PushSupport<HgRepository, HgPushSource, HgTar
 
   @Override
   public boolean shouldRequestIncomingChangesForNotCheckedRepositories() {
-    return false;
+    // load commit for all repositories if sync
+    return mySettings.getSyncSetting() == DvcsSyncSettings.Value.SYNC;
   }
 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
index 2e46fb964ed6..cfc9ad9db9f5 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTarget.java
@@ -33,7 +33,7 @@ public class HgTarget implements PushTarget {
 
   @Override
   public boolean hasSomethingToPush() {
-    return false;
+    // push is always allowed except invalid target
+    return true;
   }
-
 }
diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 6bf80725bf88..16ef95b38a3c 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -855,8 +855,12 @@ public class ExprProcessor implements CodeConstants {
     return defaultval;
   }
 
-  public static boolean getCastedExprent(Exprent exprent, VarType leftType, TextBuffer buffer, int indent,
-                                                               boolean castNull, BytecodeMappingTracer tracer) {
+  public static boolean getCastedExprent(Exprent exprent,
+                                         VarType leftType,
+                                         TextBuffer buffer,
+                                         int indent,
+                                         boolean castNull,
+                                         BytecodeMappingTracer tracer) {
     return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, tracer);
   }
 
@@ -865,24 +869,18 @@ public class ExprProcessor implements CodeConstants {
                                          TextBuffer buffer,
                                          int indent,
                                          boolean castNull,
-                                         boolean castAlways, BytecodeMappingTracer tracer) {
+                                         boolean castAlways,
+                                         BytecodeMappingTracer tracer) {
 
-    boolean ret = false;
     VarType rightType = exprent.getExprType();
 
     TextBuffer res = exprent.toJava(indent, tracer);
 
     boolean cast =
-      !leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT);
-    cast |= castAlways;
-
-    if (!cast && castNull && rightType.type == CodeConstants.TYPE_NULL) {
-      // check for a nameless anonymous class
-      cast = !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType));
-    }
-    if (!cast) {
-      cast = isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType);
-    }
+      castAlways ||
+      (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
+      (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
+      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
     if (cast) {
       if (exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
@@ -890,12 +888,11 @@ public class ExprProcessor implements CodeConstants {
       }
 
       res.prepend("(" + getCastTypeName(leftType) + ")");
-      ret = true;
     }
 
     buffer.append(res);
 
-    return ret;
+    return cast;
   }
 
   private static boolean isIntConstant(Exprent exprent) {
diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 57711eee2bd0..b80b745c04e2 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -357,21 +357,23 @@ public class InvocationExprent extends Exprent {
 
     Set<Integer> setAmbiguousParameters = getAmbiguousParameters();
 
-    boolean firstpar = true;
+    boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
       if (sigFields == null || sigFields.get(i) == null) {
-        if (!firstpar) {
+        if (!firstParameter) {
           buf.append(", ");
         }
 
         TextBuffer buff = new TextBuffer();
-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, setAmbiguousParameters.contains(i), tracer);
-
+        boolean ambiguous = setAmbiguousParameters.contains(i);
+        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
         buf.append(buff);
-        firstpar = false;
+
+        firstParameter = false;
       }
     }
+
     buf.append(")");
 
     return buf;
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
index b95b12497e7b..a99c0e4da48e 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
@@ -20,12 +20,16 @@ import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.psi.xml.XmlFile;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections.JavaFxUnresolvedFxIdReferenceInspection;
+import org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions.JavaFxInjectPageLanguageIntention;
+
+import java.util.Set;
 
 public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
   public static final DefaultLightProjectDescriptor JAVA_FX_WITH_GROOVY_DESCRIPTOR = new DefaultLightProjectDescriptor() {
@@ -66,7 +70,10 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
     myFixture.configureByFile(getTestName(true) + ".fxml");
     final IntentionAction intention = myFixture.findSingleIntention("Specify page language");
     assertNotNull(intention);
-    myFixture.launchAction(intention);
+    Set<String> languages = JavaFxInjectPageLanguageIntention.getAvailableLanguages();
+    assertContainsElements(languages, "groovy");
+    JavaFxInjectPageLanguageIntention languageIntention = (JavaFxInjectPageLanguageIntention)intention;
+    languageIntention.registerPageLanguage(getProject(), (XmlFile)myFixture.getFile(), "groovy");
     myFixture.checkResultByFile(getTestName(true) + ".fxml", getTestName(true) + "_after.fxml", true);
   }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
index 0cbd61f765a9..dc62783d23fb 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java
@@ -52,7 +52,7 @@ import java.util.TreeSet;
 public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAction {
   public static final Logger LOG = Logger.getInstance("#" + JavaFxInjectPageLanguageIntention.class.getName());
 
-  private static Set<String> getAvailableLanguages(Project project) {
+  public static Set<String> getAvailableLanguages() {
     final List<ScriptEngineFactory> engineFactories = new ScriptEngineManager().getEngineFactories();
 
     final Set<String> availableNames = new TreeSet<String>();
@@ -68,8 +68,8 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
     if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return;
     final XmlFile containingFile = (XmlFile)element.getContainingFile();
 
-    final Set<String> availableLanguages = getAvailableLanguages(project);
-    if (availableLanguages.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
+    final Set<String> availableLanguages = getAvailableLanguages();
+    if (availableLanguages.size() == 1) {
       registerPageLanguage(project, containingFile, availableLanguages.iterator().next());
     } else {
       final JBList list = new JBList(availableLanguages);
@@ -83,7 +83,7 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
     }
   }
 
-  private void registerPageLanguage(final Project project, final XmlFile containingFile, final String languageName) {
+  public void registerPageLanguage(final Project project, final XmlFile containingFile, final String languageName) {
     new WriteCommandAction.Simple(project, getFamilyName()) {
       @Override
       protected void run() {
@@ -110,7 +110,7 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
-    if (ContainerUtil.isEmpty(getAvailableLanguages(project))) {
+    if (ContainerUtil.isEmpty(getAvailableLanguages())) {
       return false;
     }
     setText(getFamilyName());
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
index eafe341d3989..8ea6b8618d71 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
@@ -26,7 +26,6 @@ import com.intellij.tasks.TaskBundle;
 import com.intellij.tasks.TaskRepositoryType;
 import com.intellij.tasks.impl.BaseRepository;
 import com.intellij.tasks.impl.BaseRepositoryImpl;
-import com.intellij.tasks.impl.TaskUtil;
 import com.intellij.tasks.impl.httpclient.ResponseUtil;
 import com.intellij.tasks.trello.model.TrelloBoard;
 import com.intellij.tasks.trello.model.TrelloCard;
@@ -320,8 +319,6 @@ public final class TrelloRepository extends BaseRepositoryImpl {
     HttpClient client = getHttpClient();
     client.executeMethod(method);
     String entityContent = ResponseUtil.getResponseContentAsString(method);
-    TaskUtil.prettyFormatJsonToLog(LOG, entityContent);
-    // LOG.debug("Response size: " + method.getResponseHeader("Content-Length").getValue() + " bytes");
     if (method.getStatusCode() != HttpStatus.SC_OK) {
       Header header = method.getResponseHeader("Content-Type");
       if (header != null && header.getValue().startsWith("text/plain")) {
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
index 31584497f43a..3ad4b12de380 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
@@ -43,7 +43,7 @@ import java.util.List;
  * @author Mikhail Golubev
  */
 public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepository> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.trello.TrelloRepositoryEditor");
+  private static final Logger LOG = Logger.getInstance(TrelloRepositoryEditor.class);
 
   private static final TrelloBoard UNSPECIFIED_BOARD = new TrelloBoard() {
     @NotNull
@@ -83,9 +83,10 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       @Override
       protected void textChanged(DocumentEvent e) {
         String password = String.valueOf(myPasswordText.getPassword());
-        if (password.equals(myRepository.getPassword())) {
+        if (password.isEmpty() || password.equals(myRepository.getPassword())) {
           return;
         }
+        LOG.debug("Authentication token was changed");
         myRepository.setPassword(password);
         new BoardsDownloader(UNSPECIFIED_BOARD) {
           @Override
@@ -119,7 +120,6 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       }
     });
     myBoardComboBox.setRenderer(new TrelloBoardRenderer("Set token first"));
-    myListComboBox.setRenderer(new TrelloListRenderer("Select board first"));
 
     myListComboBox.addItemListener(new ItemListener() {
       @Override
@@ -132,12 +132,14 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
         }
       }
     });
+    myListComboBox.setRenderer(new TrelloListRenderer("Select board first"));
 
     // Initial setup:
     if (myRepository.getCurrentUser() != null) {
       new BoardsDownloader(myRepository.getCurrentBoard()) {
         @Override
         protected List<TrelloBoard> download() throws Exception {
+          LOG.debug("Updating information about boards available to user when repository setting are shown");
           List<TrelloBoard> boards = super.download();
           if (myBoard == null) {
             return boards;
@@ -157,6 +159,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       new ListsDownloader(myRepository.getCurrentList()) {
         @Override
         protected List<TrelloList> download() throws Exception {
+          LOG.debug("Updating information about lists of board " + myRepository.getCurrentBoard() + " when repository setting are shown");
           List<TrelloList> lists = super.download();
           if (myList == null) {
             return lists;
@@ -266,6 +269,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       return myRepository.fetchUserBoards();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void updateUI(List<TrelloBoard> boards) {
       myBoardComboBox.setModel(new DefaultComboBoxModel(boards.toArray()));
@@ -296,6 +300,7 @@ public class TrelloRepositoryEditor extends BaseRepositoryEditor<TrelloRepositor
       return myRepository.fetchBoardLists();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void updateUI(List<TrelloList> lists) {
       myListComboBox.setModel(new DefaultComboBoxModel(lists.toArray()));
diff --git a/plugins/tasks/tasks-core/src/icons/TasksIcons.java b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
index 68a2e24608ea..0beca234c217 100644
--- a/plugins/tasks/tasks-core/src/icons/TasksIcons.java
+++ b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
@@ -40,15 +40,15 @@ public class TasksIcons {
   public static final Icon Github = load("/icons/github.png"); // 16x16
   public static final Icon Gitlab = load("/icons/gitlab.png"); // 16x16
   public static final Icon Jira = load("/icons/jira.png"); // 16x16
-  public static final Icon Lighthouse = load("/icons/lighthouse.gif"); // 16x16
+  public static final Icon Lighthouse = load("/icons/lighthouse.png"); // 16x16
   public static final Icon Mantis = load("/icons/mantis.png"); // 16x16
   public static final Icon Other = load("/icons/other.png"); // 16x16
   
   public static class Pivotal {
-    public static final Icon Bug = load("/icons/pivotal/bug.png"); // 14x14
-    public static final Icon Chore = load("/icons/pivotal/chore.png"); // 14x14
-    public static final Icon Feature = load("/icons/pivotal/feature.png"); // 14x14
-    public static final Icon Release = load("/icons/pivotal/release.png"); // 14x14
+    public static final Icon Bug = load("/icons/pivotal/bug.png"); // 16x16
+    public static final Icon Chore = load("/icons/pivotal/chore.png"); // 16x16
+    public static final Icon Feature = load("/icons/pivotal/feature.png"); // 16x16
+    public static final Icon Release = load("/icons/pivotal/release.png"); // 16x16
 
   }
   public static final Icon Pivotal = load("/icons/pivotal.png"); // 16x16
diff --git a/plugins/tasks/tasks-core/src/icons/asana.png b/plugins/tasks/tasks-core/src/icons/asana.png
index 25cea9634766..2d2958fc7f73 100644
Binary files a/plugins/tasks/tasks-core/src/icons/asana.png and b/plugins/tasks/tasks-core/src/icons/asana.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/asana@2x.png b/plugins/tasks/tasks-core/src/icons/asana@2x.png
new file mode 100644
index 000000000000..eafd61a24989
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/asana@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/assembla.png b/plugins/tasks/tasks-core/src/icons/assembla.png
index 5198524088cb..3e570c9880aa 100644
Binary files a/plugins/tasks/tasks-core/src/icons/assembla.png and b/plugins/tasks/tasks-core/src/icons/assembla.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/assembla@2x.png b/plugins/tasks/tasks-core/src/icons/assembla@2x.png
new file mode 100644
index 000000000000..9b2e1daa0276
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/assembla@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/autoMode.png b/plugins/tasks/tasks-core/src/icons/autoMode.png
index 9355db4b2de6..8b4cf8c4b6cf 100644
Binary files a/plugins/tasks/tasks-core/src/icons/autoMode.png and b/plugins/tasks/tasks-core/src/icons/autoMode.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/autoMode@2x.png b/plugins/tasks/tasks-core/src/icons/autoMode@2x.png
new file mode 100644
index 000000000000..572d3356fb60
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/autoMode@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bug.png b/plugins/tasks/tasks-core/src/icons/bug.png
index 9303d5a019dd..412b67006dc2 100644
Binary files a/plugins/tasks/tasks-core/src/icons/bug.png and b/plugins/tasks/tasks-core/src/icons/bug.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bug@2x.png b/plugins/tasks/tasks-core/src/icons/bug@2x.png
new file mode 100644
index 000000000000..2fc69150f98f
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/bug@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bug@2x_dark.png b/plugins/tasks/tasks-core/src/icons/bug@2x_dark.png
new file mode 100644
index 000000000000..6d02836719e9
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/bug@2x_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bug_dark.png b/plugins/tasks/tasks-core/src/icons/bug_dark.png
new file mode 100644
index 000000000000..5926f1dd2b1b
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/bug_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bugzilla.png b/plugins/tasks/tasks-core/src/icons/bugzilla.png
index b06da57f512e..7dc4666337d2 100644
Binary files a/plugins/tasks/tasks-core/src/icons/bugzilla.png and b/plugins/tasks/tasks-core/src/icons/bugzilla.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/bugzilla@2x.png b/plugins/tasks/tasks-core/src/icons/bugzilla@2x.png
new file mode 100644
index 000000000000..d010d4fe95fa
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/bugzilla@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/clock.png b/plugins/tasks/tasks-core/src/icons/clock.png
index d9cbbfc508a1..701863c24cd4 100644
Binary files a/plugins/tasks/tasks-core/src/icons/clock.png and b/plugins/tasks/tasks-core/src/icons/clock.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/clock@2x.png b/plugins/tasks/tasks-core/src/icons/clock@2x.png
new file mode 100644
index 000000000000..c2e69d55385e
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/clock@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/exception.png b/plugins/tasks/tasks-core/src/icons/exception.png
index 3edaf7ab9785..02ce6b16d348 100644
Binary files a/plugins/tasks/tasks-core/src/icons/exception.png and b/plugins/tasks/tasks-core/src/icons/exception.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/exception@2x.png b/plugins/tasks/tasks-core/src/icons/exception@2x.png
new file mode 100644
index 000000000000..1d1607adb7f1
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/exception@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/feature.png b/plugins/tasks/tasks-core/src/icons/feature.png
index 9051b6eadf38..26793add948f 100644
Binary files a/plugins/tasks/tasks-core/src/icons/feature.png and b/plugins/tasks/tasks-core/src/icons/feature.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/feature@2x.png b/plugins/tasks/tasks-core/src/icons/feature@2x.png
new file mode 100644
index 000000000000..66f44bd2ad51
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/feature@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/fogbugz.png b/plugins/tasks/tasks-core/src/icons/fogbugz.png
index 70c2d7ffef58..1b1f086720ae 100644
Binary files a/plugins/tasks/tasks-core/src/icons/fogbugz.png and b/plugins/tasks/tasks-core/src/icons/fogbugz.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/fogbugz@2x.png b/plugins/tasks/tasks-core/src/icons/fogbugz@2x.png
new file mode 100644
index 000000000000..58ba46497423
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/fogbugz@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/github.png b/plugins/tasks/tasks-core/src/icons/github.png
index b2f329a2756c..1cd6d256b56c 100644
Binary files a/plugins/tasks/tasks-core/src/icons/github.png and b/plugins/tasks/tasks-core/src/icons/github.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/github@2x.png b/plugins/tasks/tasks-core/src/icons/github@2x.png
new file mode 100644
index 000000000000..1f02f43021ee
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/github@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/github@2x_dark.png b/plugins/tasks/tasks-core/src/icons/github@2x_dark.png
new file mode 100644
index 000000000000..6bc758ad325b
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/github@2x_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/github_dark.png b/plugins/tasks/tasks-core/src/icons/github_dark.png
new file mode 100644
index 000000000000..97224b46d1a7
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/github_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/gitlab.png b/plugins/tasks/tasks-core/src/icons/gitlab.png
index 12a06e757436..b581196c21f8 100644
Binary files a/plugins/tasks/tasks-core/src/icons/gitlab.png and b/plugins/tasks/tasks-core/src/icons/gitlab.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/gitlab@2x.png b/plugins/tasks/tasks-core/src/icons/gitlab@2x.png
new file mode 100644
index 000000000000..011d5d6bcc61
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/gitlab@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/jira.png b/plugins/tasks/tasks-core/src/icons/jira.png
index 5375c427edc0..f6f1f416b09f 100644
Binary files a/plugins/tasks/tasks-core/src/icons/jira.png and b/plugins/tasks/tasks-core/src/icons/jira.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/jira@2x.png b/plugins/tasks/tasks-core/src/icons/jira@2x.png
new file mode 100644
index 000000000000..3825b73930ff
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/jira@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/jira@2x_dark.png b/plugins/tasks/tasks-core/src/icons/jira@2x_dark.png
new file mode 100644
index 000000000000..33cda03b2b27
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/jira@2x_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/jira_dark.png b/plugins/tasks/tasks-core/src/icons/jira_dark.png
new file mode 100644
index 000000000000..876771437d14
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/jira_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse.gif b/plugins/tasks/tasks-core/src/icons/lighthouse.gif
deleted file mode 100644
index e12b528031e6..000000000000
Binary files a/plugins/tasks/tasks-core/src/icons/lighthouse.gif and /dev/null differ
diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse.png b/plugins/tasks/tasks-core/src/icons/lighthouse.png
new file mode 100644
index 000000000000..bb6dc364a52e
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/lighthouse.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/lighthouse@2x.png b/plugins/tasks/tasks-core/src/icons/lighthouse@2x.png
new file mode 100644
index 000000000000..99a00441fa3a
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/lighthouse@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/mantis.png b/plugins/tasks/tasks-core/src/icons/mantis.png
index d180cfa545c7..7e783936ba3e 100644
Binary files a/plugins/tasks/tasks-core/src/icons/mantis.png and b/plugins/tasks/tasks-core/src/icons/mantis.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/mantis@2x.png b/plugins/tasks/tasks-core/src/icons/mantis@2x.png
new file mode 100644
index 000000000000..211bd8bbcf83
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/mantis@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/other.png b/plugins/tasks/tasks-core/src/icons/other.png
index fb5256180562..17988437e520 100644
Binary files a/plugins/tasks/tasks-core/src/icons/other.png and b/plugins/tasks/tasks-core/src/icons/other.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/other@2x.png b/plugins/tasks/tasks-core/src/icons/other@2x.png
new file mode 100644
index 000000000000..8950bac515e8
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/other@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal.png b/plugins/tasks/tasks-core/src/icons/pivotal.png
index 1ae1042485d4..7dcd1252a30a 100644
Binary files a/plugins/tasks/tasks-core/src/icons/pivotal.png and b/plugins/tasks/tasks-core/src/icons/pivotal.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug.png
index fb5bdeb8edcc..412b67006dc2 100644
Binary files a/plugins/tasks/tasks-core/src/icons/pivotal/bug.png and b/plugins/tasks/tasks-core/src/icons/pivotal/bug.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png
new file mode 100644
index 000000000000..2fc69150f98f
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png
new file mode 100644
index 000000000000..6d02836719e9
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/bug@2x_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png
new file mode 100644
index 000000000000..5926f1dd2b1b
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/bug_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/chore.png b/plugins/tasks/tasks-core/src/icons/pivotal/chore.png
index bfe2e63909e1..7479b84eb0df 100644
Binary files a/plugins/tasks/tasks-core/src/icons/pivotal/chore.png and b/plugins/tasks/tasks-core/src/icons/pivotal/chore.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png
new file mode 100644
index 000000000000..f4406c39f0a6
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/chore@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/feature.png b/plugins/tasks/tasks-core/src/icons/pivotal/feature.png
index a68335907b15..26793add948f 100644
Binary files a/plugins/tasks/tasks-core/src/icons/pivotal/feature.png and b/plugins/tasks/tasks-core/src/icons/pivotal/feature.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png
new file mode 100644
index 000000000000..66f44bd2ad51
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/feature@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release.png b/plugins/tasks/tasks-core/src/icons/pivotal/release.png
index 10e71b0a54a3..fd41786c4d44 100644
Binary files a/plugins/tasks/tasks-core/src/icons/pivotal/release.png and b/plugins/tasks/tasks-core/src/icons/pivotal/release.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png
new file mode 100644
index 000000000000..2365649df2a4
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png
new file mode 100644
index 000000000000..f14f527c048b
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/release@2x_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png b/plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png
new file mode 100644
index 000000000000..d9e040fafe8b
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal/release_dark.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/pivotal@2x.png b/plugins/tasks/tasks-core/src/icons/pivotal@2x.png
new file mode 100644
index 000000000000..f1afcaa3bcdb
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/pivotal@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/redmine.png b/plugins/tasks/tasks-core/src/icons/redmine.png
index 391f369cba6e..d07109f4cb53 100644
Binary files a/plugins/tasks/tasks-core/src/icons/redmine.png and b/plugins/tasks/tasks-core/src/icons/redmine.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/redmine@2x.png b/plugins/tasks/tasks-core/src/icons/redmine@2x.png
new file mode 100644
index 000000000000..55ae4db6476c
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/redmine@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/savedContext.png b/plugins/tasks/tasks-core/src/icons/savedContext.png
index 84b5f8910735..4eecb92bb136 100644
Binary files a/plugins/tasks/tasks-core/src/icons/savedContext.png and b/plugins/tasks/tasks-core/src/icons/savedContext.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/savedContext@2x.png b/plugins/tasks/tasks-core/src/icons/savedContext@2x.png
new file mode 100644
index 000000000000..1c03eaad1a36
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/savedContext@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/sprintly.png b/plugins/tasks/tasks-core/src/icons/sprintly.png
index 4e1fd1d746b2..c95cc07e904c 100644
Binary files a/plugins/tasks/tasks-core/src/icons/sprintly.png and b/plugins/tasks/tasks-core/src/icons/sprintly.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/sprintly@2x.png b/plugins/tasks/tasks-core/src/icons/sprintly@2x.png
new file mode 100644
index 000000000000..abfbc600a474
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/sprintly@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/startTimer.png b/plugins/tasks/tasks-core/src/icons/startTimer.png
index d600e7979be6..2d68e012c82e 100644
Binary files a/plugins/tasks/tasks-core/src/icons/startTimer.png and b/plugins/tasks/tasks-core/src/icons/startTimer.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/startTimer@2x.png b/plugins/tasks/tasks-core/src/icons/startTimer@2x.png
new file mode 100644
index 000000000000..c3bf2479288f
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/startTimer@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/stopTimer.png b/plugins/tasks/tasks-core/src/icons/stopTimer.png
index dfeccbaf4b82..54502704d26b 100644
Binary files a/plugins/tasks/tasks-core/src/icons/stopTimer.png and b/plugins/tasks/tasks-core/src/icons/stopTimer.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/stopTimer@2x.png b/plugins/tasks/tasks-core/src/icons/stopTimer@2x.png
new file mode 100644
index 000000000000..aa3486c09722
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/stopTimer@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/trac.png b/plugins/tasks/tasks-core/src/icons/trac.png
index 2275f30a11d0..dc10451e2dbc 100644
Binary files a/plugins/tasks/tasks-core/src/icons/trac.png and b/plugins/tasks/tasks-core/src/icons/trac.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/trac@2x.png b/plugins/tasks/tasks-core/src/icons/trac@2x.png
new file mode 100644
index 000000000000..c5c5532a7e93
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/trac@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/trello.png b/plugins/tasks/tasks-core/src/icons/trello.png
index 86d6c6ea5e45..95806c6527fe 100644
Binary files a/plugins/tasks/tasks-core/src/icons/trello.png and b/plugins/tasks/tasks-core/src/icons/trello.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/trello@2x.png b/plugins/tasks/tasks-core/src/icons/trello@2x.png
new file mode 100644
index 000000000000..e27ba0af71fd
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/trello@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/unknown.png b/plugins/tasks/tasks-core/src/icons/unknown.png
index 609fd60936e6..04c30c9facae 100644
Binary files a/plugins/tasks/tasks-core/src/icons/unknown.png and b/plugins/tasks/tasks-core/src/icons/unknown.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/unknown@2x.png b/plugins/tasks/tasks-core/src/icons/unknown@2x.png
new file mode 100644
index 000000000000..8d1e84ca4569
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/unknown@2x.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/youtrack.png b/plugins/tasks/tasks-core/src/icons/youtrack.png
index de7b35dce28e..437f9eba6993 100644
Binary files a/plugins/tasks/tasks-core/src/icons/youtrack.png and b/plugins/tasks/tasks-core/src/icons/youtrack.png differ
diff --git a/plugins/tasks/tasks-core/src/icons/youtrack@2x.png b/plugins/tasks/tasks-core/src/icons/youtrack@2x.png
new file mode 100644
index 000000000000..6ba3829c6ff6
Binary files /dev/null and b/plugins/tasks/tasks-core/src/icons/youtrack@2x.png differ
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
index 3a412bf3ca8c..68c031cea400 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.lang.xpath.xslt;
 
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
@@ -47,6 +49,8 @@ public class XsltSupport {
   public static final String XSLT_NS = "http://www.w3.org/1999/XSL/Transform";
   public static final String PLUGIN_EXTENSIONS_NS = "urn:idea:xslt-plugin#extensions";
   public static final Key<ParameterizedCachedValue<XsltChecker.LanguageLevel, PsiFile>> FORCE_XSLT_KEY = Key.create("FORCE_XSLT");
+  public static final TextAttributesKey XSLT_DIRECTIVE =
+    TextAttributesKey.createTextAttributesKey("XSLT_DIRECTIVE", DefaultLanguageHighlighterColors.TEMPLATE_LANGUAGE_COLOR);
 
   private static final Map<String, String> XPATH_ATTR_MAP = new THashMap<String, String>(10);
   private static final Map<String, Set<String>> XPATH_AVT_MAP = new THashMap<String, Set<String>>(10);
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java
new file mode 100644
index 000000000000..e4f7f43057f0
--- /dev/null
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltColorPage.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.intellij.lang.xpath.xslt.validation;
+
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.options.colors.AttributesDescriptor;
+import com.intellij.openapi.options.colors.pages.XMLColorsPage;
+import org.intellij.lang.xpath.xslt.XsltSupport;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XsltColorPage extends XMLColorsPage {
+  @NotNull
+  @Override
+  public String getDisplayName() {
+    return "XSLT";
+  }
+
+  @NotNull
+  @Override
+  public AttributesDescriptor[] getAttributeDescriptors() {
+    return new AttributesDescriptor[] { new AttributesDescriptor("XSLT directive", XsltSupport.XSLT_DIRECTIVE)};
+  }
+
+  @NotNull
+  @Override
+  public String getDemoText() {
+    return "<xsl><xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\"></xsl>\n" +
+           "    <xsl><xsl:template match=\"/hello-world\"></xsl>\n" +
+           "        <html>\n" +
+           "            <body>\n" +
+           "                <xsl><xsl:value-of select=\"greeting\"/></xsl>\n" +
+           "            </body>\n" +
+           "        </html>\n" +
+           "    <xsl></xsl:template></xsl>\n" +
+           "<xsl></xsl:stylesheet></xsl>";
+  }
+
+  @Override
+  public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap() {
+    return Collections.singletonMap("xsl", XsltSupport.XSLT_DIRECTIVE);
+  }
+}
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java
new file mode 100644
index 000000000000..6687c71e70c2
--- /dev/null
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/XsltNSColorProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.intellij.lang.xpath.xslt.validation;
+
+import com.intellij.codeInsight.daemon.impl.analysis.XmlNSColorProvider;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.psi.xml.XmlTag;
+import org.intellij.lang.xpath.xslt.XsltSupport;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Dmitry Avdeev
+ */
+public class XsltNSColorProvider implements XmlNSColorProvider {
+
+  @Nullable
+  @Override
+  public TextAttributesKey getKeyForNamespace(String namespace, XmlElement context) {
+    if (!(context instanceof XmlTag)) return null;
+    if (XsltSupport.XSLT_NS.equals(((XmlTag)context).getNamespace())) return XsltSupport.XSLT_DIRECTIVE;
+    return null;
+  }
+}
diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 840cccb76aca..0be80ec48645 100644
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -145,6 +145,9 @@
     <annotator language="XPath" implementationClass="org.intellij.lang.xpath.xslt.validation.XsltAnnotator"/>
     <annotator language="XML" implementationClass="org.intellij.lang.xpath.xslt.validation.XsltXmlAnnotator"/>
 
+    <xml.nsColorProvider implementation="org.intellij.lang.xpath.xslt.validation.XsltNSColorProvider"/>
+    <colorSettingsPage implementation="org.intellij.lang.xpath.xslt.validation.XsltColorPage"/>
+
     <lang.documentationProvider language="XML" implementationClass="org.intellij.lang.xpath.xslt.impl.XsltDocumentationProvider"/>
     <lang.documentationProvider language="XPath" implementationClass="org.intellij.lang.xpath.xslt.impl.XsltDocumentationProvider"/>
 
diff --git a/python/edu/course-creator/resources/META-INF/plugin.xml b/python/edu/course-creator/resources/META-INF/plugin.xml
index 7173f9d1c15b..f4e0d510a8d8 100644
--- a/python/edu/course-creator/resources/META-INF/plugin.xml
+++ b/python/edu/course-creator/resources/META-INF/plugin.xml
@@ -48,6 +48,9 @@
     <action id="CreateLesson" class="org.jetbrains.plugins.coursecreator.actions.CCCreateLesson">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
     </action>
+    <action id="ChangeCourseInfo" class="org.jetbrains.plugins.coursecreator.actions.CCChangeCourseInfo">
+      <add-to-group group-id="ProjectViewPopupMenu" anchor="before" relative-to-action="PackCourse"/>
+    </action>
     <action id="CreateTaskFile" class="org.jetbrains.plugins.coursecreator.actions.CCCreateTaskFile">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
     </action>
diff --git a/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft b/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
index 9d1842742845..313b9150c467 100644
--- a/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
+++ b/python/edu/course-creator/resources/fileTemplates/internal/test_helper.py.ft
@@ -46,9 +46,9 @@ def check_importable_path(path):
     try:
         import_file(path)
     except:
-        failed("File contains syntax errors", test_file_importable.func_name)
+        failed("File contains syntax errors", test_file_importable.__name__)
         return
-    passed(test_file_importable.func_name)
+    passed(test_file_importable.__name__)
 
 
 def import_file(path):
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
index 3573216e9efa..b1917292df32 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCDocumentListener.java
@@ -1,24 +1,23 @@
 package org.jetbrains.plugins.coursecreator;
 
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
 import org.jetbrains.plugins.coursecreator.format.TaskFile;
 import org.jetbrains.plugins.coursecreator.format.TaskWindow;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * author: liana
- * data: 7/16/14.
  * Listens changes in study files and updates
  * coordinates of all the windows in current task file
  */
 public abstract class CCDocumentListener extends DocumentAdapter {
   private final TaskFile myTaskFile;
-  private int myOldLine;
-  private int myOldLineStartOffset;
-  private TaskWindow myTaskWindow;
+  private List<TaskWindowWrapper> myTaskWindows = new ArrayList<TaskWindowWrapper>();
+
 
   public CCDocumentListener(TaskFile taskFile) {
     myTaskFile = taskFile;
@@ -29,39 +28,71 @@ public abstract class CCDocumentListener extends DocumentAdapter {
   // with fragments containing "\n"
   @Override
   public void beforeDocumentChange(DocumentEvent e) {
-    int offset = e.getOffset();
-    int oldEnd = offset + e.getOldLength();
     Document document = e.getDocument();
-    myOldLine = document.getLineNumber(oldEnd);
-    myOldLineStartOffset = document.getLineStartOffset(myOldLine);
-    int line = document.getLineNumber(offset);
-    int offsetInLine = offset - document.getLineStartOffset(line);
-    LogicalPosition pos = new LogicalPosition(line, offsetInLine);
-    myTaskWindow = myTaskFile.getTaskWindow(document, pos);
+    myTaskWindows.clear();
+    for (TaskWindow taskWindow : myTaskFile.getTaskWindows()) {
+      int twStart = taskWindow.getRealStartOffset(document);
+      int length = useLength() ? taskWindow.getLength() : taskWindow.getReplacementLength();
+      int twEnd = twStart + length;
+      myTaskWindows.add(new TaskWindowWrapper(taskWindow, twStart, twEnd));
+    }
   }
 
   @Override
   public void documentChanged(DocumentEvent e) {
     if (e instanceof DocumentEventImpl) {
-        DocumentEventImpl event = (DocumentEventImpl)e;
-        Document document = e.getDocument();
-        int offset = e.getOffset();
-        int change = event.getNewLength() - event.getOldLength();
-        if (myTaskWindow != null) {
-          updateTaskWindowLength(e.getNewFragment(), myTaskWindow, change);
+      DocumentEventImpl event = (DocumentEventImpl)e;
+      Document document = e.getDocument();
+      int offset = e.getOffset();
+      int change = event.getNewLength() - event.getOldLength();
+      for (TaskWindowWrapper taskWindowWrapper : myTaskWindows) {
+        int twStart = taskWindowWrapper.getTwStart();
+        if (twStart > offset) {
+          twStart += change;
+        }
+        int twEnd = taskWindowWrapper.getTwEnd();
+        if (twEnd >= offset) {
+          twEnd += change;
+        }
+        TaskWindow taskWindow = taskWindowWrapper.getTaskWindow();
+        int line = document.getLineNumber(twStart);
+        int start = twStart - document.getLineStartOffset(line);
+        int length = twEnd - twStart;
+        taskWindow.setLine(line);
+        taskWindow.setStart(start);
+        if (useLength()) {
+          taskWindow.setLength(length);
+        } else {
+          taskWindow.setReplacementLength(length);
         }
-        int newEnd = offset + event.getNewLength();
-        int newLine = document.getLineNumber(newEnd);
-        int lineChange = newLine - myOldLine;
-        myTaskFile.incrementLines(myOldLine + 1, lineChange);
-        int newEndOffsetInLine = offset + e.getNewLength() - document.getLineStartOffset(newLine);
-        int oldEndOffsetInLine = offset + e.getOldLength() - myOldLineStartOffset;
-        myTaskFile.updateLine(lineChange, myOldLine, newEndOffsetInLine, oldEndOffsetInLine, useLength());
       }
+    }
   }
 
-  protected abstract void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change);
-
   protected abstract  boolean useLength();
+
+  private static class TaskWindowWrapper {
+    public TaskWindow myTaskWindow;
+    public int myTwStart;
+    public int myTwEnd;
+
+    public TaskWindowWrapper(TaskWindow taskWindow, int twStart, int twEnd) {
+      myTaskWindow = taskWindow;
+      myTwStart = twStart;
+      myTwEnd = twEnd;
+    }
+
+    public int getTwStart() {
+      return myTwStart;
+    }
+
+    public int getTwEnd() {
+      return myTwEnd;
+    }
+
+    public TaskWindow getTaskWindow() {
+      return myTaskWindow;
+    }
+  }
 }
 
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
index 74afc795b60a..24688c4b2709 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
@@ -72,12 +72,6 @@ public class CCEditorFactoryListener implements EditorFactoryListener {
       super(taskFile);
     }
 
-    @Override
-    protected void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change) {
-        int newLength = taskWindow.getReplacementLength() + change;
-        taskWindow.setReplacementLength(newLength <= 0 ? 0 : newLength);
-    }
-
     @Override
     protected boolean useLength() {
       return false;
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
index 8b524dbffd4b..88a242492581 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.coursecreator.actions.CCRunTestsAction;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.format.Lesson;
 import org.jetbrains.plugins.coursecreator.format.Task;
@@ -158,7 +159,8 @@ public class CCProjectComponent implements ProjectComponent {
     }
 
     private void deleteTaskFile(Course course, VirtualFile removedFile) {
-      VirtualFile taskDir = removedFile.getParent();
+
+      final VirtualFile taskDir = removedFile.getParent();
       if (taskDir == null || !taskDir.getName().contains("task")) {
         return;
       }
@@ -182,6 +184,12 @@ public class CCProjectComponent implements ProjectComponent {
       if (taskFile == null) {
         return;
       }
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        @Override
+        public void run() {
+          CCRunTestsAction.clearTestEnvironment(taskDir, myProject);
+        }
+      });
       String name = CCProjectService.getRealTaskFileName(removedFile.getName());
       task.getTaskFiles().remove(name);
     }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
index 73e5bc7edf93..b40c6c5f913d 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectGenerator.java
@@ -20,6 +20,8 @@ import icons.CourseCreatorIcons;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.coursecreator.actions.CCCreateLesson;
+import org.jetbrains.plugins.coursecreator.actions.CCCreateTask;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.ui.CCNewProjectPanel;
 
@@ -69,9 +71,10 @@ public class CCProjectGenerator extends PythonProjectGenerator implements Direct
         catch (Exception ignored) {
         }
         DirectoryUtil.createSubdirectories("hints", projectDir, "\\/");
+        final PsiDirectory lessonDir = CCCreateLesson.createLesson(projectDir, 1, null, null, course);
+        CCCreateTask.createTask(null, project, lessonDir, false);
       }
     }.execute();
-
   }
 
   @NotNull
@@ -81,7 +84,7 @@ public class CCProjectGenerator extends PythonProjectGenerator implements Direct
     message = mySettingsPanel.getDescription().equals("") ? "Enter description" : message;
     message = mySettingsPanel.getAuthor().equals("") ? "Enter author name" : message;
     message = mySettingsPanel.getName().equals("") ? "Enter course name" : message;
-    return message.equals("")? ValidationResult.OK : new ValidationResult(message) ;
+    return message.equals("") ? ValidationResult.OK : new ValidationResult(message);
   }
 
   @Nullable
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
index 6c2635fc2273..e423da553d1b 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
@@ -18,11 +18,27 @@ import org.jetbrains.plugins.coursecreator.CCProjectService;
 import org.jetbrains.plugins.coursecreator.format.*;
 import org.jetbrains.plugins.coursecreator.ui.CreateTaskWindowDialog;
 
+import java.util.List;
+
 public class CCAddTaskWindow extends DumbAwareAction {
   private static final Logger LOG = Logger.getInstance(CCAddTaskWindow.class);
 
   public CCAddTaskWindow() {
-    super("Add problem to solve","Add problem to solve", null);
+    super("Add problem to solve", "Add problem to solve", null);
+  }
+
+
+  private static boolean areTaskWindowsIntersect(@NotNull final TaskFile taskFile, @NotNull final Document document, int start, int end) {
+    List<TaskWindow> taskWindows = taskFile.getTaskWindows();
+    for (TaskWindow existingTaskWindow : taskWindows) {
+      int twStart = existingTaskWindow.getRealStartOffset(document);
+      int twEnd = existingTaskWindow.getReplacementLength() + twStart;
+      if ((start >= twStart && start < twEnd) || (end > twStart && end <= twEnd) ||
+          (twStart >= start && twStart < end) || (twEnd > start && twEnd <= end)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
@@ -35,7 +51,6 @@ public class CCAddTaskWindow extends DumbAwareAction {
     if (file == null) return;
     final Editor editor = CommonDataKeys.EDITOR.getData(e.getDataContext());
     if (editor == null) return;
-
     final SelectionModel model = editor.getSelectionModel();
     final Document document = PsiDocumentManager.getInstance(project).getDocument(file);
     if (document == null) return;
@@ -54,14 +69,23 @@ public class CCAddTaskWindow extends DumbAwareAction {
     final Lesson lesson = course.getLesson(lessonDir.getName());
     final Task task = lesson.getTask(taskDir.getName());
     final TaskFile taskFile = task.getTaskFile(file.getName());
+    if (taskFile == null) {
+      return;
+    }
+    if (areTaskWindowsIntersect(taskFile, document, start, end)) {
+      return;
+    }
     final TaskWindow taskWindow = new TaskWindow(lineNumber, realStart, length, model.getSelectedText());
-    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(), task.getIndex(), file.getVirtualFile().getNameWithoutExtension(), taskFile.getTaskWindows().size() + 1);
+    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(),
+                                                            task.getIndex(), file.getVirtualFile().getNameWithoutExtension(),
+                                                            taskFile.getTaskWindows().size() + 1);
     dlg.show();
     if (dlg.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
       return;
     }
     int index = taskFile.getTaskWindows().size() + 1;
     taskFile.addTaskWindow(taskWindow, index);
+    taskFile.sortTaskWindows();
     taskWindow.drawHighlighter(editor, false);
     taskWindow.createGuardedBlocks(editor);
   }
@@ -85,11 +109,14 @@ public class CCAddTaskWindow extends DumbAwareAction {
       presentation.setEnabled(false);
       return;
     }
-    if (!editor.getSelectionModel().hasSelection()) {
+    SelectionModel selectionModel = editor.getSelectionModel();
+    if (!selectionModel.hasSelection()) {
       presentation.setVisible(false);
       presentation.setEnabled(false);
       return;
     }
+    int start = selectionModel.getSelectionStart();
+    int end = selectionModel.getSelectionEnd();
 
     final CCProjectService service = CCProjectService.getInstance(project);
     final Course course = service.getCourse();
@@ -116,6 +143,11 @@ public class CCAddTaskWindow extends DumbAwareAction {
       presentation.setEnabled(false);
       return;
     }
+    if (areTaskWindowsIntersect(taskFile, editor.getDocument(), start, end)) {
+      presentation.setVisible(false);
+      presentation.setEnabled(false);
+      return;
+    }
     presentation.setVisible(true);
     presentation.setEnabled(true);
   }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
new file mode 100644
index 000000000000..a556cd1113f1
--- /dev/null
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCChangeCourseInfo.java
@@ -0,0 +1,109 @@
+package org.jetbrains.plugins.coursecreator.actions;
+
+import com.intellij.ide.IdeView;
+import com.intellij.ide.projectView.ProjectView;
+import com.intellij.ide.util.DirectoryChooserUtil;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.project.DumbAwareAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.psi.PsiDirectory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.coursecreator.CCProjectService;
+import org.jetbrains.plugins.coursecreator.format.Course;
+import org.jetbrains.plugins.coursecreator.ui.CCNewProjectPanel;
+
+import javax.swing.*;
+
+public class CCChangeCourseInfo extends DumbAwareAction {
+  public CCChangeCourseInfo() {
+    super("Change Course information", "Change Course Information", null);
+  }
+
+  @Override
+  public void update(@NotNull AnActionEvent event) {
+    if (!CCProjectService.setCCActionAvailable(event)) {
+      return;
+    }
+    final Presentation presentation = event.getPresentation();
+    presentation.setVisible(false);
+    presentation.setEnabled(false);
+    final Project project = event.getData(CommonDataKeys.PROJECT);
+    if (project == null) {
+      return;
+    }
+    final IdeView view = event.getData(LangDataKeys.IDE_VIEW);
+    if (view == null) {
+      return;
+    }
+    final PsiDirectory[] directories = view.getDirectories();
+    if (directories.length == 0) {
+      return;
+    }
+    final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
+    if (directory != null && !project.getBaseDir().equals(directory.getVirtualFile())) {
+      return;
+    }
+    presentation.setVisible(true);
+    presentation.setEnabled(true);
+
+  }
+
+  @Override
+  public void actionPerformed(@NotNull AnActionEvent e) {
+    if (!CCProjectService.setCCActionAvailable(e)) {
+      return;
+    }
+    final Project project = e.getProject();
+    if (project == null) {
+      return;
+    }
+    Course course = CCProjectService.getInstance(project).getCourse();
+    if (course == null) {
+      return;
+    }
+    final IdeView view = e.getData(LangDataKeys.IDE_VIEW);
+    if (view == null) {
+      return;
+    }
+    final PsiDirectory[] directories = view.getDirectories();
+    if (directories.length == 0) {
+      return;
+    }
+    final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
+    if (directory != null && !project.getBaseDir().equals(directory.getVirtualFile())) {
+      return;
+    }
+    CCNewProjectPanel panel = new CCNewProjectPanel(course.getName(), course.getAuthor(), course.getDescription());
+    ChangeCourseInfoDialog changeCourseInfoDialog =
+      new ChangeCourseInfoDialog(project, panel);
+    changeCourseInfoDialog.show();
+    if (changeCourseInfoDialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+      course.setAuthor(panel.getAuthor());
+      course.setName(panel.getName());
+      course.setDescription(panel.getDescription());
+      ProjectView.getInstance(project).refresh();
+    }
+  }
+
+  static class ChangeCourseInfoDialog extends DialogWrapper {
+
+    CCNewProjectPanel myNewProjectPanel;
+    public ChangeCourseInfoDialog(@Nullable Project project, CCNewProjectPanel panel) {
+      super(project);
+      setTitle("Change Course Information");
+      myNewProjectPanel = panel;
+      init();
+    }
+
+    @Nullable
+    @Override
+    protected JComponent createCenterPanel() {
+      return myNewProjectPanel.getMainPanel();
+    }
+  }
+}
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
index c201e4ddaee4..b5a0292db684 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
@@ -134,6 +134,9 @@ public class CCCreateCourseArchive extends DumbAwareAction {
     final TaskFile taskFile = taskFiles.getValue();
     TaskFile taskFileSaved = new TaskFile();
     taskFile.copy(taskFileSaved);
+    for (TaskWindow taskWindow : taskFile.getTaskWindows()) {
+      taskWindow.setLength(taskWindow.getReplacementLength());
+    }
     CommandProcessor.getInstance().executeCommand(project, new Runnable() {
       @Override
       public void run() {
@@ -168,7 +171,7 @@ public class CCCreateCourseArchive extends DumbAwareAction {
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
           @Override
           public void run() {
-            document.replaceString(offset, offset + taskWindow.getReplacementLength(), taskText);
+            document.replaceString(offset, offset + taskWindow.getLength(), taskText);
             FileDocumentManager.getInstance().saveDocument(document);
           }
         });
@@ -254,11 +257,6 @@ public class CCCreateCourseArchive extends DumbAwareAction {
       super(taskFile);
     }
 
-    @Override
-    protected void updateTaskWindowLength(CharSequence fragment, TaskWindow taskWindow, int change) {
-      //we don't need to update task window length
-    }
-
     @Override
     protected boolean useLength() {
       return true;
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
index bd7cb83ecc99..58b950b5a637 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateLesson.java
@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.coursecreator.CCProjectService;
 import org.jetbrains.plugins.coursecreator.format.Course;
 import org.jetbrains.plugins.coursecreator.format.Lesson;
@@ -43,17 +44,27 @@ public class CCCreateLesson extends DumbAwareAction {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        final PsiDirectory lessonDirectory = DirectoryUtil.createSubdirectories("lesson" + (size+1), directory, "\\/");
-        if (lessonDirectory != null) {
-          view.selectElement(lessonDirectory);
-          final Lesson lesson = new Lesson(lessonName);
-          lesson.setIndex(size + 1);
-          course.addLesson(lesson, lessonDirectory);
-        }
+        createLesson(directory, size + 1, lessonName, view, course);
       }
     });
   }
 
+  @Nullable
+  public static PsiDirectory createLesson(@NotNull final  PsiDirectory projectDir, int index, String name, final IdeView view,
+                                  @NotNull final Course course) {
+    String lessonFolderName = "lesson" + index;
+    final PsiDirectory lessonDirectory = DirectoryUtil.createSubdirectories("lesson" + index, projectDir, "\\/");
+    if (lessonDirectory != null) {
+      if (view != null) {
+        view.selectElement(lessonDirectory);
+      }
+      final Lesson lesson = new Lesson(name != null ? name : lessonFolderName);
+      lesson.setIndex(index);
+      course.addLesson(lesson, lessonDirectory);
+    }
+    return lessonDirectory;
+  }
+
   @Override
   public void update(@NotNull AnActionEvent event) {
     if (!CCProjectService.setCCActionAvailable(event)) {
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
index fed406ec8df0..a0a16687bf23 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateTask.java
@@ -36,24 +36,35 @@ public class CCCreateTask extends DumbAwareAction {
     final IdeView view = e.getData(LangDataKeys.IDE_VIEW);
     final Project project = e.getData(CommonDataKeys.PROJECT);
 
-    if (view == null || project == null) {
+    if (project == null) {
       return;
     }
     final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
 
     if (directory == null) return;
+    createTask(view, project, directory, true);
+  }
+
+  public static void createTask(final IdeView view, final Project project, final PsiDirectory lessonDir, boolean showDialog) {
     final CCProjectService service = CCProjectService.getInstance(project);
     final Course course = service.getCourse();
-    final Lesson lesson = course.getLesson(directory.getName());
+    final Lesson lesson = course.getLesson(lessonDir.getName());
     final int size = lesson.getTaskList().size();
+    final String taskName;
+    if (showDialog) {
+      taskName = Messages.showInputDialog("Name:", "Task Name", null, "task" + (size + 1), null);
+    }
+    else {
+      taskName = "task" + (size + 1);
+    }
 
-    final String taskName = Messages.showInputDialog("Name:", "Task Name", null, "task" + (size + 1), null);
-    if (taskName == null) return;
-
+    if (taskName == null) {
+      return;
+    }
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        final PsiDirectory taskDirectory = DirectoryUtil.createSubdirectories("task" + (size + 1), directory, "\\/");
+        final PsiDirectory taskDirectory = DirectoryUtil.createSubdirectories("task" + (size + 1), lessonDir, "\\/");
         if (taskDirectory != null) {
           final FileTemplate template = FileTemplateManager.getInstance().getInternalTemplate("task.html");
           final FileTemplate testsTemplate = FileTemplateManager.getInstance().getInternalTemplate("tests");
@@ -74,16 +85,17 @@ public class CCCreateTask extends DumbAwareAction {
                 for (VirtualFile virtualFile : fileEditorManager.getOpenFiles()) {
                   fileEditorManager.closeFile(virtualFile);
                 }
-                EditorHelper.openInEditor(testsFile, false);
-                EditorHelper.openInEditor(taskPyFile, false);
-                view.selectElement(taskFile);
+                if (view != null) {
+                  EditorHelper.openInEditor(testsFile, false);
+                  EditorHelper.openInEditor(taskPyFile, false);
+                  view.selectElement(taskFile);
+                  EditorHelper.openInEditor(taskFile, false);
+                }
               }
             });
           }
           catch (Exception ignored) {
           }
-
-
         }
       }
     });
@@ -126,6 +138,5 @@ public class CCCreateTask extends DumbAwareAction {
 
     presentation.setVisible(true);
     presentation.setEnabled(true);
-
   }
 }
\ No newline at end of file
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
index 462678c477ad..777afc4e1a85 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRunTestsAction.java
@@ -84,6 +84,7 @@ public class CCRunTestsAction extends AnAction {
     if (lessonDir == null) return;
     if (course == null) return;
     final Lesson lesson = course.getLesson(lessonDir.getName());
+    if (lesson == null) return;
     final Task task = lesson.getTask(taskDir.getName());
     if (task == null) {
       presentation.setVisible(false);
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
index d865902a8025..e08743fc6941 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
@@ -5,10 +5,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.coursecreator.CCProjectService;
-import org.jetbrains.plugins.coursecreator.format.Course;
-import org.jetbrains.plugins.coursecreator.format.Lesson;
-import org.jetbrains.plugins.coursecreator.format.Task;
-import org.jetbrains.plugins.coursecreator.format.TaskFile;
+import org.jetbrains.plugins.coursecreator.format.*;
 import org.jetbrains.plugins.coursecreator.ui.CreateTaskWindowDialog;
 
 public class CCShowTaskWindowDetails extends CCTaskWindowAction {
@@ -29,7 +26,8 @@ public class CCShowTaskWindowDetails extends CCTaskWindowAction {
     final Lesson lesson = course.getLesson(lessonDir.getName());
     final Task task = lesson.getTask(taskDir.getName());
     final TaskFile taskFile = state.getTaskFile();
-    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, state.getTaskWindow(), lesson.getIndex(), task.getIndex(),
+    TaskWindow taskWindow = state.getTaskWindow();
+    CreateTaskWindowDialog dlg = new CreateTaskWindowDialog(project, taskWindow, lesson.getIndex(), task.getIndex(),
                                                             file.getVirtualFile().getNameWithoutExtension(),
                                                             taskFile.getTaskWindows().size() + 1);
     dlg.show();
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
index e124a6eb305d..e9af3472f260 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
@@ -58,4 +58,20 @@ public class Course {
     }
     Collections.sort(lessons);
   }
+
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
 }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
index c48a4f41d7e1..9fb10eaa179a 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
@@ -6,9 +6,9 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.plugins.coursecreator.CCProjectService;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class TaskFile {
@@ -57,52 +57,6 @@ public class TaskFile {
     return null;
   }
 
-  /**
-   * Updates task window lines
-   *
-   * @param startLine lines greater than this line and including this line will be updated
-   * @param change    change to be added to line numbers
-   */
-  public void incrementLines(int startLine, int change) {
-    for (TaskWindow taskTaskWindow : task_windows) {
-      if (taskTaskWindow.getLine() >= startLine) {
-        taskTaskWindow.setLine(taskTaskWindow.getLine() + change);
-      }
-    }
-  }
-
-  /**
-   * Updates windows in specific line
-   *
-   * @param lineChange         change in line number
-   * @param line               line to be updated
-   * @param newEndOffsetInLine distance from line start to end of inserted fragment
-   * @param oldEndOffsetInLine distance from line start to end of changed fragment
-   */
-  public void updateLine(int lineChange, int line, int newEndOffsetInLine, int oldEndOffsetInLine, boolean useLength) {
-    for (TaskWindow w : task_windows) {
-      if ((w.getLine() == line) && (w.getStart() > oldEndOffsetInLine)) {
-        int distance = w.getStart() - oldEndOffsetInLine;
-        boolean coveredByPrevTW = false;
-        int prevIndex = w.getIndex() - 1;
-        if (CCProjectService.indexIsValid(prevIndex, task_windows)) {
-          TaskWindow prevTW = task_windows.get(prevIndex - 1);
-          if (prevTW.getLine() == line) {
-            int prevLength = useLength ? prevTW.getLength() : prevTW.getReplacementLength();
-            int endOffset = prevTW.getStart() + prevLength;
-            if (endOffset >= newEndOffsetInLine) {
-              coveredByPrevTW = true;
-            }
-          }
-        }
-        if (lineChange != 0 || newEndOffsetInLine <= w.getStart() || coveredByPrevTW) {
-          w.setStart(distance + newEndOffsetInLine);
-          w.setLine(line + lineChange);
-        }
-      }
-    }
-  }
-
   public void copy(@NotNull final TaskFile target) {
     target.setIndex(myIndex);
     for (TaskWindow taskWindow : task_windows) {
@@ -110,6 +64,7 @@ public class TaskFile {
                                               taskWindow.getLength(), "");
       target.getTaskWindows().add(savedWindow);
       savedWindow.setIndex(taskWindow.getIndex());
+      savedWindow.setReplacementLength(taskWindow.getReplacementLength());
     }
   }
 
@@ -121,6 +76,8 @@ public class TaskFile {
       }
       taskWindowUpdated.setLine(taskWindow.getLine());
       taskWindowUpdated.setStart(taskWindow.getStart());
+      taskWindowUpdated.setReplacementLength(taskWindow.getReplacementLength());
+      taskWindowUpdated.setLength(taskWindow.getLength());
     }
   }
 
@@ -142,4 +99,11 @@ public class TaskFile {
       taskWindow.createGuardedBlocks(editor);
     }
   }
+
+  public void sortTaskWindows() {
+    Collections.sort(task_windows);
+    for (int i = 0; i < task_windows.size(); i++) {
+      task_windows.get(i).setIndex(i + 1);
+    }
+  }
 }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
index dc7551929e30..385aaeddf26e 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
@@ -20,7 +20,7 @@ import org.jetbrains.plugins.coursecreator.CCProjectService;
 import java.io.File;
 import java.util.List;
 
-public class TaskWindow implements Comparable{
+public class TaskWindow implements Comparable<TaskWindow> {
 
   @Expose public int line;
   @Expose public int start;
@@ -120,8 +120,7 @@ public class TaskWindow implements Comparable{
   }
 
   @Override
-  public int compareTo(Object o) {
-    TaskWindow taskWindow = (TaskWindow)o;
+  public int compareTo(@NotNull TaskWindow taskWindow) {
     int lineDiff = line - taskWindow.line;
     if (lineDiff == 0) {
       return start - taskWindow.start;
@@ -154,4 +153,8 @@ public class TaskWindow implements Comparable{
       .addRangeHighlighter(start, end, HighlighterLayer.LAST + 1, null, HighlighterTargetArea.EXACT_RANGE);
     blocks.add(rh);
   }
+
+  public void setLength(int length) {
+    this.length = length;
+  }
 }
\ No newline at end of file
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
index d463718978bb..de23a904422c 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CCNewProjectPanel.java
@@ -27,6 +27,13 @@ public class CCNewProjectPanel {
     myDescription.setLineWrap(true);
   }
 
+  public CCNewProjectPanel(String name, String author, String description) {
+    this();
+    myName.setText(name);
+    myAuthorField.setText(author);
+    myDescription.setText(description);
+  }
+
   public JPanel getMainPanel() {
     return myPanel;
   }
@@ -54,7 +61,9 @@ public class CCNewProjectPanel {
 
     @Override
     protected void textChanged(DocumentEvent e) {
-      myValidationManager.validate();
+      if (myValidationManager != null) {
+        myValidationManager.validate();
+      }
     }
   }
 }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
index 2240d58a2846..213fc55e2cb7 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
@@ -95,6 +95,10 @@ public class CreateTaskWindowDialog extends DialogWrapper {
       myTaskWindow.setHint(hintName);
       String hintText = myPanel.getHintText();
       createHint(hintName, hintText);
+    } else {
+      if (myTaskWindow.getHintName() != null) {
+        deleteHint();
+      }
     }
     super.doOKAction();
   }
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
index 4fc64fa769c6..a09945718aaa 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
@@ -32,7 +32,7 @@ public class CreateTaskWindowPanel extends JPanel {
         // 1 for checked
         enableHint(state == 1);
         if (state == 2) {
-          myDialog.deleteHint();
+          resetHint();
         }
       }
     });
diff --git a/python/edu/learn-python/resources/courses/introduction_course.zip b/python/edu/learn-python/resources/courses/introduction_course.zip
index 07ad882088c1..c44ce1790f94 100644
Binary files a/python/edu/learn-python/resources/courses/introduction_course.zip and b/python/edu/learn-python/resources/courses/introduction_course.zip differ
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
index b558667734bc..a9630f6f730c 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
@@ -5,19 +5,30 @@ import com.google.gson.stream.JsonReader;
 import com.intellij.facet.ui.FacetEditorValidator;
 import com.intellij.facet.ui.FacetValidatorsManager;
 import com.intellij.facet.ui.ValidationResult;
+import com.intellij.ide.projectView.ProjectView;
+import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.lang.javascript.boilerplate.GithubDownloadUtil;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
+import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
+import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.platform.DirectoryProjectGenerator;
 import com.intellij.platform.templates.github.GeneratorException;
 import com.intellij.platform.templates.github.ZipUtil;
-import com.jetbrains.python.edu.course.Course;
-import com.jetbrains.python.edu.course.CourseInfo;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.jetbrains.python.edu.course.*;
 import com.jetbrains.python.edu.ui.StudyNewProjectPanel;
 import com.jetbrains.python.newProject.PythonProjectGenerator;
 import icons.StudyIcons;
@@ -150,12 +161,60 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
     try {
       reader = new InputStreamReader(new FileInputStream(mySelectedCourseFile));
       Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
-      Course course = gson.fromJson(reader, Course.class);
+      final Course course = gson.fromJson(reader, Course.class);
       course.init(false);
       course.create(baseDir, new File(mySelectedCourseFile.getParent()));
       course.setResourcePath(mySelectedCourseFile.getAbsolutePath());
       VirtualFileManager.getInstance().refreshWithoutFileWatcher(true);
       StudyTaskManager.getInstance(project).setCourse(course);
+      final boolean[] initialized = {false};
+      ToolWindowManagerEx.getInstanceEx(myProject).addToolWindowManagerListener(new ToolWindowManagerAdapter() {
+        @Override
+        public void stateChanged() {
+          final AbstractProjectViewPane projectViewPane = ProjectView.getInstance(myProject).getCurrentProjectViewPane();
+          if (projectViewPane == null || initialized[0]) return;
+          JTree tree = projectViewPane.getTree();
+          if (tree == null) {
+            return;
+          }
+          tree.updateUI();
+
+          ApplicationManager.getApplication().invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              LocalFileSystem.getInstance().refresh(false);
+              final Lesson firstLesson = StudyUtils.getFirst(course.getLessons());
+              final Task firstTask = StudyUtils.getFirst(firstLesson.getTaskList());
+              final VirtualFile taskDir = firstTask.getTaskDir(myProject);
+              if (taskDir == null) return;
+              final Map<String, TaskFile> taskFiles = firstTask.getTaskFiles();
+
+              VirtualFile activeVirtualFile = null;
+              for (Map.Entry<String, TaskFile> entry : taskFiles.entrySet()) {
+                final String name = entry.getKey();
+                final TaskFile taskFile = entry.getValue();
+                final VirtualFile virtualFile = ((VirtualDirectoryImpl)taskDir).refreshAndFindChild(name);
+                if (virtualFile != null) {
+                  FileEditorManager.getInstance(project).openFile(virtualFile, true);
+                  if (!taskFile.getTaskWindows().isEmpty()) {
+                    activeVirtualFile = virtualFile;
+                  }
+                }
+              }
+              if (activeVirtualFile != null) {
+                final PsiFile file = PsiManager.getInstance(myProject).findFile(activeVirtualFile);
+                ProjectView.getInstance(project).select(file, activeVirtualFile, true);
+                initialized[0] = true;
+              }
+            }
+          }, ModalityState.current(), new Condition() {
+            @Override
+            public boolean value(Object o) {
+              return project.isDisposed();
+            }
+          });
+        }
+      });
     }
     catch (FileNotFoundException e) {
       LOG.error(e);
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
index 8955032aa408..848becfae1b1 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/StudyDocumentListener.java
@@ -2,22 +2,22 @@ package com.jetbrains.python.edu;
 
 
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
 import com.jetbrains.python.edu.course.TaskFile;
 import com.jetbrains.python.edu.course.TaskWindow;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Listens changes in study files and updates
  * coordinates of all the windows in current task file
  */
 public class StudyDocumentListener extends DocumentAdapter {
   private final TaskFile myTaskFile;
-  private int myOldLine;
-  private int myOldLineStartOffset;
-  private TaskWindow myTaskWindow;
+  private List<TaskWindowWrapper> myTaskWindows = new ArrayList<TaskWindowWrapper>();
 
   public StudyDocumentListener(TaskFile taskFile) {
     myTaskFile = taskFile;
@@ -28,15 +28,13 @@ public class StudyDocumentListener extends DocumentAdapter {
   // with fragments containing "\n"
   @Override
   public void beforeDocumentChange(DocumentEvent e) {
-    int offset = e.getOffset();
-    int oldEnd = offset + e.getOldLength();
     Document document = e.getDocument();
-    myOldLine = document.getLineNumber(oldEnd);
-    myOldLineStartOffset = document.getLineStartOffset(myOldLine);
-    int line = document.getLineNumber(offset);
-    int offsetInLine = offset - document.getLineStartOffset(line);
-    LogicalPosition pos = new LogicalPosition(line, offsetInLine);
-    myTaskWindow = myTaskFile.getTaskWindow(document, pos);
+    myTaskWindows.clear();
+    for (TaskWindow taskWindow : myTaskFile.getTaskWindows()) {
+      int twStart = taskWindow.getRealStartOffset(document);
+      int twEnd = twStart + taskWindow.getLength();
+      myTaskWindows.add(new TaskWindowWrapper(taskWindow, twStart, twEnd));
+    }
   }
 
   @Override
@@ -46,17 +44,47 @@ public class StudyDocumentListener extends DocumentAdapter {
       Document document = e.getDocument();
       int offset = e.getOffset();
       int change = event.getNewLength() - event.getOldLength();
-      if (myTaskWindow != null) {
-        int newLength = myTaskWindow.getLength() + change;
-        myTaskWindow.setLength(newLength <= 0 ? 0 : newLength);
+      for (TaskWindowWrapper taskWindowWrapper : myTaskWindows) {
+        int twStart = taskWindowWrapper.getTwStart();
+        if (twStart > offset) {
+          twStart += change;
+        }
+        int twEnd = taskWindowWrapper.getTwEnd();
+        if (twEnd >= offset) {
+          twEnd += change;
+        }
+        TaskWindow taskWindow = taskWindowWrapper.getTaskWindow();
+        int line = document.getLineNumber(twStart);
+        int start = twStart - document.getLineStartOffset(line);
+        int length = twEnd - twStart;
+        taskWindow.setLine(line);
+        taskWindow.setStart(start);
+        taskWindow.setLength(length);
       }
-      int newEnd = offset + event.getNewLength();
-      int newLine = document.getLineNumber(newEnd);
-      int lineChange = newLine - myOldLine;
-      myTaskFile.incrementLines(myOldLine + 1, lineChange);
-      int newEndOffsetInLine = offset + e.getNewLength() - document.getLineStartOffset(newLine);
-      int oldEndOffsetInLine = offset + e.getOldLength() - myOldLineStartOffset;
-      myTaskFile.updateLine(lineChange, myOldLine, newEndOffsetInLine, oldEndOffsetInLine);
+    }
+  }
+
+  private static class TaskWindowWrapper {
+    public TaskWindow myTaskWindow;
+    public int myTwStart;
+    public int myTwEnd;
+
+    public TaskWindowWrapper(TaskWindow taskWindow, int twStart, int twEnd) {
+      myTaskWindow = taskWindow;
+      myTwStart = twStart;
+      myTwEnd = twEnd;
+    }
+
+    public int getTwStart() {
+      return myTwStart;
+    }
+
+    public int getTwEnd() {
+      return myTwEnd;
+    }
+
+    public TaskWindow getTaskWindow() {
+      return myTaskWindow;
     }
   }
 }
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java b/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
index aaaef375a093..e9281e957855 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/course/TaskFile.java
@@ -127,20 +127,6 @@ public class TaskFile implements Stateful {
     return null;
   }
 
-  /**
-   * Updates task window lines
-   *
-   * @param startLine lines greater than this line and including this line will be updated
-   * @param change    change to be added to line numbers
-   */
-  public void incrementLines(int startLine, int change) {
-    for (TaskWindow taskTaskWindow : taskWindows) {
-      if (taskTaskWindow.getLine() >= startLine) {
-        taskTaskWindow.setLine(taskTaskWindow.getLine() + change);
-      }
-    }
-  }
-
   /**
    * Initializes state of task file
    *
@@ -165,36 +151,6 @@ public class TaskFile implements Stateful {
     myIndex = index;
   }
 
-  /**
-   * Updates windows in specific line
-   *
-   * @param lineChange         change in line number
-   * @param line               line to be updated
-   * @param newEndOffsetInLine distance from line start to end of inserted fragment
-   * @param oldEndOffsetInLine distance from line start to end of changed fragment
-   */
-  public void updateLine(int lineChange, int line, int newEndOffsetInLine, int oldEndOffsetInLine) {
-    for (TaskWindow w : taskWindows) {
-      if ((w.getLine() == line) && (w.getStart() > oldEndOffsetInLine)) {
-        int distance = w.getStart() - oldEndOffsetInLine;
-        boolean coveredByPrevTW = false;
-        int prevIndex = w.getIndex() - 1;
-        if (StudyUtils.indexIsValid(prevIndex, taskWindows)) {
-          TaskWindow prevTW = taskWindows.get(prevIndex);
-          if (prevTW.getLine() == line) {
-            int endOffset = prevTW.getStart() + prevTW.getLength();
-            if (endOffset >= newEndOffsetInLine) {
-              coveredByPrevTW = true;
-            }
-          }
-        }
-        if (lineChange != 0 || newEndOffsetInLine <= w.getStart() || coveredByPrevTW) {
-          w.setStart(distance + newEndOffsetInLine);
-          w.setLine(line + lineChange);
-        }
-      }
-    }
-  }
 
   public static void copy(@NotNull final TaskFile source, @NotNull final TaskFile target) {
     List<TaskWindow> sourceTaskWindows = source.getTaskWindows();
diff --git a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
index 19acded8f238..0c0208b1f144 100644
--- a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
+++ b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileLineMarkerProvider.java
@@ -54,23 +54,28 @@ public class PyExecuteFileLineMarkerProvider implements LineMarkerProvider {
             return new LineMarkerGutterIconRenderer<PsiElement>(this){
               @Override
               public AnAction getClickAction() {
-                final DefaultActionGroup group = new DefaultActionGroup();
-                group.add(new PyRunCurrentFileAction());
-                final PyExecuteFileExtensionPoint[] extensions =
-                  ApplicationManager.getApplication().getExtensions(PyExecuteFileExtensionPoint.EP_NAME);
-                for (PyExecuteFileExtensionPoint extension : extensions) {
-                  final AnAction action = extension.getRunAction();
-                  group.add(action);
-                }
-                if (group.getChildrenCount() == 1) {
-                  return new PyRunCurrentFileAction();
-                }
+
                 return new AnAction() {
                   @Override
                   public void actionPerformed(@NotNull AnActionEvent e) {
-                    final ListPopup popup =
-                      new PopupFactoryImpl().createActionGroupPopup(null, group, e.getDataContext(), false, false, false, null, 5);
-                    popup.showInBestPositionFor(e.getDataContext());
+                    final DefaultActionGroup group = new DefaultActionGroup();
+                    group.add(new PyRunCurrentFileAction());
+                    final PyExecuteFileExtensionPoint[] extensions =
+                      ApplicationManager.getApplication().getExtensions(PyExecuteFileExtensionPoint.EP_NAME);
+                    for (PyExecuteFileExtensionPoint extension : extensions) {
+                      final AnAction action = extension.getRunAction();
+                      action.update(e);
+                      if (e.getPresentation().isEnabled())
+                        group.add(action);
+                    }
+                    if (group.getChildrenCount() == 1) {
+                      new PyRunCurrentFileAction().actionPerformed(e);
+                    }
+                    else {
+                      final ListPopup popup =
+                        new PopupFactoryImpl().createActionGroupPopup(null, group, e.getDataContext(), false, false, false, null, 5);
+                      popup.showInBestPositionFor(e.getDataContext());
+                    }
                   }
                 };
               }
diff --git a/python/helpers/pydev/_pydev_imports_tipper.py b/python/helpers/pydev/_pydev_imports_tipper.py
index 76cf2cdc473f..35c4867533a8 100644
--- a/python/helpers/pydev/_pydev_imports_tipper.py
+++ b/python/helpers/pydev/_pydev_imports_tipper.py
@@ -178,8 +178,11 @@ def GenerateImportsTipForModule(obj_to_complete, dirComps=None, getattr=getattr,
         args = ''
 
         try:
-            obj = getattr(obj_to_complete, d)
-        except: #just ignore and get it without aditional info
+            try:
+                obj = getattr(obj_to_complete.__class__, d)
+            except:
+                obj = getattr(obj_to_complete, d)
+        except: #just ignore and get it without additional info
             ret.append((d, '', args, TYPE_BUILTIN))
         else:
 
diff --git a/python/helpers/pydev/third_party/pkgutil_old.py b/python/helpers/pydev/_pydev_imps/_pydev_pkgutil_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/pkgutil_old.py
rename to python/helpers/pydev/_pydev_imps/_pydev_pkgutil_old.py
diff --git a/python/helpers/pydev/third_party/pluginbase.py b/python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
similarity index 99%
rename from python/helpers/pydev/third_party/pluginbase.py
rename to python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
index 18bd50524fc2..ed4203fb6f89 100644
--- a/python/helpers/pydev/third_party/pluginbase.py
+++ b/python/helpers/pydev/_pydev_imps/_pydev_pluginbase.py
@@ -16,14 +16,14 @@ from pydevd_constants import IS_PY24, IS_PY3K, IS_JYTHON
 
 
 if IS_PY24:
-    from third_party.uuid_old import uuid4
+    from _pydev_imps._pydev_uuid_old import uuid4
 else:
     from uuid import uuid4
 
 if IS_PY3K:
     import pkgutil
 else:
-    import pkgutil_old as pkgutil
+    from _pydev_imps import _pydev_pkgutil_old as pkgutil
 
 import errno
 try:
diff --git a/python/helpers/pydev/third_party/uuid_old.py b/python/helpers/pydev/_pydev_imps/_pydev_uuid_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/uuid_old.py
rename to python/helpers/pydev/_pydev_imps/_pydev_uuid_old.py
diff --git a/python/helpers/pydev/_pydev_threading.py b/python/helpers/pydev/_pydev_threading.py
index 62b300b86cd0..940dce5edcf3 100644
--- a/python/helpers/pydev/_pydev_threading.py
+++ b/python/helpers/pydev/_pydev_threading.py
@@ -1,4 +1,7 @@
-from threading import enumerate, currentThread, Condition, Event, Timer, Thread
+from threading import * # Make up for things we may forget @UnusedWildImport
+
+# Force what we know we need
+from threading import enumerate, currentThread, Condition, Event, Timer, Thread, Lock
 try:
     from threading import settrace
 except:
diff --git a/python/helpers/pydev/import_hook.py b/python/helpers/pydev/import_hook.py
new file mode 100644
index 000000000000..64bc623c22fe
--- /dev/null
+++ b/python/helpers/pydev/import_hook.py
@@ -0,0 +1,43 @@
+
+import sys
+from pydevd_constants import IS_PY24, IS_PY3K
+from pydevd_constants import DictContains
+from types import ModuleType
+
+
+class ImportHookManager(ModuleType):
+    def __init__(self, name, system_import):
+        ModuleType.__init__(self, name)
+        self._system_import = system_import
+        self._modules_to_patch = {}
+
+    def add_module_name(self, module_name, activate_function):
+        self._modules_to_patch[module_name] = activate_function
+
+    def do_import(self, name, globals=None, locals=None, fromlist=None, level=-2):
+        if level == -2:
+            # fake impossible value; default value depends on version
+            if IS_PY24:
+                # the level parameter was added in version 2.5
+                return self._system_import(name, globals, locals, fromlist)
+            elif IS_PY3K:
+                # default value for level parameter in python 3
+                level = 0
+            else:
+                # default value for level parameter in other versions
+                level = -1
+        module = self._system_import(name, globals, locals, fromlist, level)
+        if DictContains(self._modules_to_patch, name):
+            self._modules_to_patch[name]() #call activate function
+            self._modules_to_patch.pop(name)
+        return module
+
+try:
+    import __builtin__ as builtins
+except ImportError:
+    import builtins
+
+import_hook_manager = ImportHookManager(__name__ + '.import_hook', builtins.__import__)
+builtins.__import__ = import_hook_manager.do_import
+sys.modules[import_hook_manager.__name__] = import_hook_manager
+del builtins
\ No newline at end of file
diff --git a/python/helpers/pydev/pydev_ipython/matplotlibtools.py b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
new file mode 100644
index 000000000000..075c43781ab3
--- /dev/null
+++ b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
@@ -0,0 +1,132 @@
+
+import sys
+from import_hook import import_hook_manager
+
+backends = {'tk': 'TkAgg',
+            'gtk': 'GTKAgg',
+            'wx': 'WXAgg',
+            'qt': 'Qt4Agg', # qt3 not supported
+            'qt4': 'Qt4Agg',
+            'osx': 'MacOSX'}
+
+# We also need a reverse backends2guis mapping that will properly choose which
+# GUI support to activate based on the desired matplotlib backend.  For the
+# most part it's just a reverse of the above dict, but we also need to add a
+# few others that map to the same GUI manually:
+backend2gui = dict(zip(backends.values(), backends.keys()))
+backend2gui['Qt4Agg'] = 'qt'
+# In the reverse mapping, there are a few extra valid matplotlib backends that
+# map to the same GUI support
+backend2gui['GTK'] = backend2gui['GTKCairo'] = 'gtk'
+backend2gui['WX'] = 'wx'
+backend2gui['CocoaAgg'] = 'osx'
+
+
+def find_gui_and_backend():
+    """Return the gui and mpl backend."""
+    matplotlib = sys.modules['matplotlib']
+    # WARNING: this assumes matplotlib 1.1 or newer!!
+    backend = matplotlib.rcParams['backend']
+    # In this case, we need to find what the appropriate gui selection call
+    # should be for IPython, so we can activate inputhook accordingly
+    gui = backend2gui.get(backend, None)
+    return gui, backend
+
+
+def is_interactive_backend(backend):
+    """ Check if backend is interactive """
+    matplotlib = sys.modules['matplotlib']
+    from matplotlib.rcsetup import interactive_bk, non_interactive_bk
+    if backend in interactive_bk:
+        return True
+    elif backend in non_interactive_bk:
+        return False
+    else:
+        return matplotlib.is_interactive()
+
+
+def patch_use(interpreter):
+    """ Patch matplotlib function 'use' """
+    matplotlib = sys.modules['matplotlib']
+    def patched_use(*args, **kwargs):
+        matplotlib.real_use(*args, **kwargs)
+        gui, backend = find_gui_and_backend()
+        interpreter.enableGui(gui)
+
+    setattr(matplotlib, "real_use", getattr(matplotlib, "use"))
+    setattr(matplotlib, "use", patched_use)
+
+
+def activate_matplotlib(interpreter):
+    """Set interactive to True for interactive backends."""
+    def activate_matplotlib_inner():
+        matplotlib = sys.modules['matplotlib']
+        gui, backend = find_gui_and_backend()
+        is_interactive = is_interactive_backend(backend)
+        if is_interactive:
+            interpreter.enableGui(gui)
+            if not matplotlib.is_interactive():
+                sys.stdout.write("Backend %s is interactive backend. Turning interactive mode on.\n" % backend)
+            matplotlib.interactive(True)
+        else:
+            if matplotlib.is_interactive():
+                sys.stdout.write("Backend %s is non-interactive backend. Turning interactive mode off.\n" % backend)
+            matplotlib.interactive(False)
+        patch_use(interpreter)
+    return activate_matplotlib_inner
+
+
+def init_matplotlib(interpreter):
+    import_hook_manager.add_module_name("matplotlib", activate_matplotlib(interpreter))
+
+
+def flag_calls(func):
+    """Wrap a function to detect and flag when it gets called.
+
+    This is a decorator which takes a function and wraps it in a function with
+    a 'called' attribute. wrapper.called is initialized to False.
+
+    The wrapper.called attribute is set to False right before each call to the
+    wrapped function, so if the call fails it remains False.  After the call
+    completes, wrapper.called is set to True and the output is returned.
+
+    Testing for truth in wrapper.called allows you to determine if a call to
+    func() was attempted and succeeded."""
+
+    # don't wrap twice
+    if hasattr(func, 'called'):
+        return func
+
+    def wrapper(*args,**kw):
+        wrapper.called = False
+        out = func(*args,**kw)
+        wrapper.called = True
+        return out
+
+    wrapper.called = False
+    wrapper.__doc__ = func.__doc__
+    return wrapper
+
+
+def activate_pylab():
+    pylab = sys.modules['pylab']
+    pylab.show._needmain = False
+    # We need to detect at runtime whether show() is called by the user.
+    # For this, we wrap it into a decorator which adds a 'called' flag.
+    pylab.draw_if_interactive = flag_calls(pylab.draw_if_interactive)
+
+
+def init_pylab():
+    import_hook_manager.add_module_name("pylab", activate_pylab)
+
+
+def activate_pyplot():
+    pyplot = sys.modules['matplotlib.pyplot']
+    pyplot.show._needmain = False
+    # We need to detect at runtime whether show() is called by the user.
+    # For this, we wrap it into a decorator which adds a 'called' flag.
+    pyplot.draw_if_interactive = flag_calls(pyplot.draw_if_interactive)
+
+
+def init_pyplot():
+    import_hook_manager.add_module_name("pyplot", activate_pyplot)
\ No newline at end of file
diff --git a/python/helpers/pydev/pydev_runfiles.py b/python/helpers/pydev/pydev_runfiles.py
index bb704db3f240..b20927584088 100644
--- a/python/helpers/pydev/pydev_runfiles.py
+++ b/python/helpers/pydev/pydev_runfiles.py
@@ -3,11 +3,9 @@ from __future__ import nested_scopes
 import fnmatch
 import os.path
 from pydev_runfiles_coverage import StartCoverageSupport
-import pydev_runfiles_unittest
 from pydevd_constants import * #@UnusedWildImport
 import re
 import time
-import unittest
 
 
 #=======================================================================================================================
@@ -558,6 +556,7 @@ class PydevTestRunner(object):
 
 
     def _decorate_test_suite(self, suite, pyfile, module_name):
+        import unittest
         if isinstance(suite, unittest.TestSuite):
             add = False
             suite.__pydev_pyfile__ = pyfile
@@ -582,6 +581,8 @@ class PydevTestRunner(object):
     def find_tests_from_modules(self, file_and_modules_and_module_name):
         """ returns the unittests given a list of modules """
         #Use our own suite!
+        import pydev_runfiles_unittest
+        import unittest
         unittest.TestLoader.suiteClass = pydev_runfiles_unittest.PydevTestSuite
         loader = unittest.TestLoader()
 
@@ -628,6 +629,7 @@ class PydevTestRunner(object):
     def filter_tests(self, test_objs, internal_call=False):
         """ based on a filter name, only return those tests that have
             the test case names that match """
+        import unittest
         if not internal_call:
             if not self.configuration.include_tests and not self.tests and not self.configuration.exclude_tests:
                 #No need to filter if we have nothing to filter!
@@ -692,6 +694,7 @@ class PydevTestRunner(object):
 
     def iter_tests(self, test_objs):
         #Note: not using yield because of Jython 2.1.
+        import unittest
         tests = []
         for test_obj in test_objs:
             if isinstance(test_obj, unittest.TestSuite):
@@ -762,6 +765,7 @@ class PydevTestRunner(object):
         all_tests = self.find_tests_from_modules(file_and_modules_and_module_name)
         all_tests = self.filter_tests(all_tests)
 
+        import pydev_runfiles_unittest
         test_suite = pydev_runfiles_unittest.PydevTestSuite(all_tests)
         import pydev_runfiles_xml_rpc
         pydev_runfiles_xml_rpc.notifyTestsCollected(test_suite.countTestCases())
diff --git a/python/helpers/pydev/pydevconsole.py b/python/helpers/pydev/pydevconsole.py
index 9b4e2a89efba..b38847a82925 100644
--- a/python/helpers/pydev/pydevconsole.py
+++ b/python/helpers/pydev/pydevconsole.py
@@ -171,6 +171,11 @@ def process_exec_queue(interpreter):
 
     set_return_control_callback(return_control)
 
+    from pydev_ipython.matplotlibtools import init_matplotlib, init_pylab, init_pyplot
+    init_matplotlib(interpreter)
+    init_pylab()
+    init_pyplot()
+
     while 1:
         # Running the request may have changed the inputhook in use
         inputhook = get_inputhook()
@@ -322,6 +327,10 @@ def get_interpreter():
     try:
         interpreterInterface = getattr(__builtin__, 'interpreter')
     except AttributeError:
+        # fake return_controll_callback function just to prevent exception in PyCharm bebug console
+        from pydev_ipython.inputhook import set_return_control_callback
+        set_return_control_callback(lambda x: True)
+
         interpreterInterface = InterpreterInterface(None, None, threading.currentThread())
         setattr(__builtin__, 'interpreter', interpreterInterface)
 
diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py
index cd6a034e5aba..dfac7691dc79 100644
--- a/python/helpers/pydev/pydevd.py
+++ b/python/helpers/pydev/pydevd.py
@@ -116,9 +116,10 @@ DONT_TRACE = {
               'threading.py':1,
 
               # thirs party libs that we don't want to trace
-              'pluginbase.py':1,
-              'pkgutil_old.py':1,
-              'uuid_old.py':1,
+              '_pydev_pluginbase.py':1,
+              '_pydev_pkgutil_old.py':1,
+              '_pydev_uuid_old.py':1,
+
 
               #things from pydev that we don't want to trace
               '_pydev_execfile.py':1,
diff --git a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
index 6a64f4e7ed41..51264ceea75e 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/python/helpers/pydev/pydevd_attach_to_process/add_code_to_python_process.py
@@ -263,6 +263,10 @@ def resolve_label(process, label):
 def is_python_64bit():
     return (struct.calcsize('P') == 8)
 
+def is_mac():
+    import platform
+    return platform.system() == 'Darwin'
+
 def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
     assert '\'' not in python_code, 'Having a single quote messes with our command.'
     from winappdbg import compat
@@ -395,11 +399,11 @@ def run_python_code_windows(pid, python_code, connect_debugger_tracing=False, sh
 def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
     assert '\'' not in python_code, 'Having a single quote messes with our command.'
     filedir = os.path.dirname(__file__)
-    
+
     # Valid arguments for arch are i386, i386:x86-64, i386:x64-32, i8086,
     #   i386:intel, i386:x86-64:intel, i386:x64-32:intel, i386:nacl,
     #   i386:x86-64:nacl, i386:x64-32:nacl, auto.
-    
+
     if is_python_64bit():
         suffix = 'amd64'
         arch = 'i386:x86-64'
@@ -408,7 +412,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
         arch = 'i386'
 
     print('Attaching with arch: %s'% (arch,))
-        
+
     target_dll = os.path.join(filedir, 'attach_linux_%s.so' % suffix)
     target_dll = os.path.normpath(target_dll)
     if not os.path.exists(target_dll):
@@ -443,7 +447,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
         "--eval-command='call DoAttach(%s, \"%s\", %s)'" % (
             is_debug, python_code, show_debug_info)
     ])
-    
+
 
     if connect_debugger_tracing:
         cmd.extend([
@@ -472,8 +476,96 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
     return out, err
 
 
+def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_debug_info=0):
+    assert '\'' not in python_code, 'Having a single quote messes with our command.'
+    filedir = os.path.dirname(__file__)
+
+    # Valid arguments for arch are i386, i386:x86-64, i386:x64-32, i8086,
+    #   i386:intel, i386:x86-64:intel, i386:x64-32:intel, i386:nacl,
+    #   i386:x86-64:nacl, i386:x64-32:nacl, auto.
+
+    if is_python_64bit():
+        suffix = 'x86_64.dylib'
+        arch = 'i386:x86-64'
+    else:
+        suffix = 'x86.dylib'
+        arch = 'i386'
+
+    print('Attaching with arch: %s'% (arch,))
+
+    target_dll = os.path.join(filedir, 'attach_%s' % suffix)
+    target_dll = os.path.normpath(target_dll)
+    if not os.path.exists(target_dll):
+        raise RuntimeError('Could not find dll file to inject: %s' % target_dll)
+
+    lldb_threads_settrace_file = os.path.join(filedir, 'linux', 'lldb_threads_settrace.py')
+    lldb_threads_settrace_file = os.path.normpath(lldb_threads_settrace_file)
+    if not os.path.exists(lldb_threads_settrace_file):
+        raise RuntimeError('Could not find file to settrace: %s' % lldb_threads_settrace_file)
+
+    # Note: we currently don't support debug builds
+    is_debug = 0
+    # Note that the space in the beginning of each line in the multi-line is important!
+    cmd = [
+        'lldb',
+        '--no-lldbinit',  # Do not automatically parse any '.lldbinit' files.
+        # '--attach-pid',
+        # str(pid),
+        # '--arch',
+        # arch,
+        '--script-language',
+        'Python'
+        #         '--batch-silent',
+    ]
+
+
+    cmd.extend([
+        "-o 'process attach --pid %d'"%pid,
+        "-o 'expr (void*)dlopen(\"%s\", 2);'" % target_dll,
+        "-o 'expr (int)hello();'",
+        "-o 'expr (int)DoAttach(%s, \"%s\", %s);'" % (
+            is_debug, python_code, show_debug_info),
+    ])
+
+
+    if connect_debugger_tracing:
+        cmd.extend([
+            # "-o 'expr (int) SetSysTraceFunc(0, 0);'",
+            "-o 'command script import %s'" % (lldb_threads_settrace_file,),
+            ])
+
+    cmd.extend([
+        "-o 'process continue'",
+        "-o 'process detach'",
+        # "-o 'script import os; os._exit(1)'",
+    ])
+
+    #print ' '.join(cmd)
+
+    env = os.environ.copy()
+    # Remove the PYTHONPATH (if gdb has a builtin Python it could fail if we
+    # have the PYTHONPATH for a different python version or some forced encoding).
+    env.pop('PYTHONIOENCODING', None)
+    env.pop('PYTHONPATH', None)
+    print('Running: %s' % (' '.join(cmd)))
+    p = subprocess.Popen(
+        ' '.join(cmd),
+        shell=True,
+        env=env,
+        stdout=None,
+        stderr=None,
+        )
+    print('Running lldb in target process.')
+    out, err = p.communicate()
+    print('stdout: %s' % (out,))
+    print('stderr: %s' % (err,))
+    return out, err
+
+
 if sys.platform == 'win32':
     run_python_code = run_python_code_windows
+elif is_mac():
+    run_python_code = run_python_code_mac
 else:
     run_python_code = run_python_code_linux
 
diff --git a/python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib b/python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
new file mode 100755
index 000000000000..ffa9f1d9db2f
Binary files /dev/null and b/python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib differ
diff --git a/python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib b/python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
new file mode 100755
index 000000000000..60e07417295a
Binary files /dev/null and b/python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib differ
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile b/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile
new file mode 100644
index 000000000000..aedfe16ee56c
--- /dev/null
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/Makefile
@@ -0,0 +1,64 @@
+# Defaults which can be overridden.
+OS = macosx
+ARCH_X86 = x86
+ARCH_X86_64 = x86_64
+
+CC=g++
+LD=libtool
+CPPFLAGS = -I.
+CFLAGS +=-fPIC -D_REENTRANT -nostartfiles
+
+ARCH_FLAG_X86 = -arch i386
+ARCH_FLAG_X86_64 = -arch x86_64
+
+INSTALL_DIR_X86 = ../os/$(OS)/$(ARCH_X86)
+INSTALL_DIR_X86_64 = ../os/$(OS)/$(ARCH_X86_64)
+INSTALL_DIR_LINUX_X86 = ../os/$(LINUX)/$(ARCH_X86)
+INSTALL_DIR_LINUX_X86_64 = ../os/$(LINUX)/$(ARCH_X86_64)
+
+ATTACH = attach_mac.so
+ATTACH_NAME_FULL_X86 = $(INSTALL_DIR_X86)/attach_x86.dylib
+ATTACH_NAME_FULL_X86_64 = $(INSTALL_DIR_X86_64)/attach_x86_64.dylib
+
+OBJS_ATTACH_X86 = attach_linux_$(ARCH_X86).o
+OBJS_ATTACH_X86_64 = attach_linux_$(ARCH_X86_64).o
+
+OBJS_X86 = $(OBJS_ATTACH_X86)
+OBJS_X86_64 = $(OBJS_ATTACH_X86_64)
+
+all: x86 x86_64
+
+x86: $(ATTACH_NAME_FULL_X86)
+
+x86_64: $(ATTACH_NAME_FULL_X86_64)
+
+linux_x86: $(ATTACH_NAME_FULL_LINUX_X86)
+linux_x86_64: $(ATTACH_NAME_FULL_LINUX_X86_64)
+
+rebuild: clean all
+
+$(ATTACH_NAME_FULL_X86): $(OBJS_ATTACH_X86)
+	mkdir -p $(INSTALL_DIR_X86)
+	$(CC) -dynamiclib  $(ARCH_FLAG_X86) -o $(ATTACH_NAME_FULL_X86) $(OBJS_ATTACH_X86) -lc
+
+$(ATTACH_NAME_FULL_X86_64): $(OBJS_ATTACH_X86_64)
+	mkdir -p $(INSTALL_DIR_X86_64)
+	$(CC) -dynamiclib  $(ARCH_FLAG_X86_64) -o $(ATTACH_NAME_FULL_X86_64) $(OBJS_ATTACH_X86_64) -lc
+
+$(ATTACH_NAME_FULL_LINUX_X86): $(OBJS_ATTACH_X86)
+	mkdir -p $(INSTALL_DIR_LINUX_X86)
+	$(CC) -m32 -g -shared -Wl,-soname,$(ATTACH) $(LDFLAGS) -o $(ATTACH_NAME_FULL_LINUX_X86) $(OBJS_ATTACH_X86)
+
+$(ATTACH_NAME_FULL_LINUX_X86_64): $(OBJS_ATTACH_X86_64)
+	mkdir -p $(INSTALL_DIR_LINUX_X86_64)
+	$(CC) -g -shared -Wl,-soname,$(ATTACH) $(LDFLAGS) -o $(ATTACH_NAME_FULL_LINUX_X86_64) $(OBJS_ATTACH_X86_64)
+
+attach_linux_$(ARCH_X86).o: attach_linux.c
+	$(CC) $(CFLAGS) $(ARCH_FLAG_X86) $(CPPFLAGS) -c -o $@ attach_linux.c
+
+attach_linux_$(ARCH_X86_64).o: attach_linux.c
+	$(CC) $(CFLAGS) $(ARCH_FLAG_X86_64) $(CPPFLAGS) -c -o $@ attach_linux.c
+
+clean :
+	$(RM) $(OBJS_X86) $(ATTACH_NAME_FULL_X86)
+	$(RM) $(OBJS_X86_64) $(ATTACH_NAME_FULL_X86_64)
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
index f5e0c2a556ab..46b170f90404 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
@@ -12,19 +12,22 @@
 
 // Exported function: hello(): Just to print something and check that we've been
 // able to connect.
-extern int hello(void);
+extern "C" int hello(void);
 
 int hello()
 {
     printf("Hello world!\n");
-    void *hndl = dlsym (NULL, "PyGILState_Ensure");
+
+    void *main_hndl = dlopen(NULL, 0x2);
+
+    void *hndl = dlsym (main_hndl, "PyGILState_Ensure");
     if(hndl == NULL){
         printf("NULL\n");
 
     }else{
         printf("Worked (found PyGILState_Ensure)!\n");
-
     }
+
     printf("%d", GetPythonVersion());
 
 
@@ -36,8 +39,8 @@ int hello()
 // which are already running.
 // isDebug is pretty important! Must be true on python debug builds (python_d)
 // If this value is passed wrongly the program will crash.
-extern int SetSysTraceFunc(bool showDebugInfo, bool isDebug);
-extern int DoAttach(bool isDebug, const char *command, bool showDebugInfo);
+extern "C" int SetSysTraceFunc(bool showDebugInfo, bool isDebug);
+extern "C" int DoAttach(bool isDebug, const char *command, bool showDebugInfo);
 
 // Internal function to keep on the tracing
 int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug);
@@ -123,7 +126,8 @@ public:
 int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
 {
     Py_IsInitialized isInitFunc;
-    *(void**)(&isInitFunc) = dlsym(0, "Py_IsInitialized");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&isInitFunc) = dlsym(main_hndl, "Py_IsInitialized");
     CHECK_NULL(isInitFunc, "Py_IsInitialized not found.\n", 1);
 
     if(!isInitFunc()){
@@ -136,7 +140,7 @@ int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
     PythonVersion version = GetPythonVersion();
 
     PyInterpreterState_Head interpHeadFunc;
-    *(void**)(&interpHeadFunc) = dlsym(0, "PyInterpreterState_Head");
+    *(void**)(&interpHeadFunc) = dlsym(main_hndl, "PyInterpreterState_Head");
     CHECK_NULL(interpHeadFunc, "PyInterpreterState_Head not found.\n", 3);
 
     PyInterpreterState* head = interpHeadFunc();
@@ -148,15 +152,15 @@ int DoAttach(bool isDebug, const char *command, bool showDebugInfo)
     // have any more problems.
 
     PyGILState_Ensure pyGilStateEnsureFunc;
-    *(void**)(&pyGilStateEnsureFunc) = dlsym(0, "PyGILState_Ensure");
+    *(void**)(&pyGilStateEnsureFunc) = dlsym(main_hndl, "PyGILState_Ensure");
     CHECK_NULL(pyGilStateEnsureFunc, "PyGILState_Ensure not found.\n", 5);
 
     PyGILState_Release pyGilStateReleaseFunc;
-    *(void**)(&pyGilStateReleaseFunc) = dlsym(0, "PyGILState_Release");
+    *(void**)(&pyGilStateReleaseFunc) = dlsym(main_hndl, "PyGILState_Release");
     CHECK_NULL(pyGilStateReleaseFunc, "PyGILState_Release not found.\n", 6);
 
     PyRun_SimpleString pyRun_SimpleString;
-    *(void**)(&pyRun_SimpleString) = dlsym(0, "PyRun_SimpleString");
+    *(void**)(&pyRun_SimpleString) = dlsym(main_hndl, "PyRun_SimpleString");
     CHECK_NULL(pyRun_SimpleString, "PyRun_SimpleString not found.\n", 6);
 
     PyGILState_STATE pyGILState = pyGilStateEnsureFunc();
@@ -176,7 +180,8 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
         printf("SetSysTraceFunc started.\n");
     }
     Py_IsInitialized isInitFunc;
-    *(void**)(&isInitFunc) = dlsym(0, "Py_IsInitialized");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&isInitFunc) = dlsym(main_hndl, "Py_IsInitialized");
     CHECK_NULL(isInitFunc, "Py_IsInitialized not found.\n", 1);
 
     if(!isInitFunc()){
@@ -189,18 +194,18 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
     PythonVersion version = GetPythonVersion();
 
     PyInterpreterState_Head interpHeadFunc;
-    *(void**)(&interpHeadFunc) = dlsym(0, "PyInterpreterState_Head");
+    *(void**)(&interpHeadFunc) = dlsym(main_hndl, "PyInterpreterState_Head");
     CHECK_NULL(interpHeadFunc, "PyInterpreterState_Head not found.\n", 3);
 
     PyInterpreterState* head = interpHeadFunc();
     CHECK_NULL(head, "Interpreter not initialized.\n", 4);
 
     PyGILState_Ensure pyGilStateEnsureFunc;
-    *(void**)(&pyGilStateEnsureFunc) = dlsym(0, "PyGILState_Ensure");
+    *(void**)(&pyGilStateEnsureFunc) = dlsym(main_hndl, "PyGILState_Ensure");
     CHECK_NULL(pyGilStateEnsureFunc, "PyGILState_Ensure not found.\n", 5);
 
     PyGILState_Release pyGilStateReleaseFunc;
-    *(void**)(&pyGilStateReleaseFunc) = dlsym(0, "PyGILState_Release");
+    *(void**)(&pyGilStateReleaseFunc) = dlsym(main_hndl, "PyGILState_Release");
     CHECK_NULL(pyGilStateReleaseFunc, "PyGILState_Release not found.\n", 6);
 
     PyGILState_STATE pyGILState = pyGilStateEnsureFunc();
@@ -213,17 +218,19 @@ int SetSysTraceFunc(bool showDebugInfo, bool isDebug)
 
 int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     PyBool_FromLong boolFromLongFunc;
-    *(void**)(&boolFromLongFunc) = dlsym(0, "PyBool_FromLong");
+    void *main_hndl = dlopen(NULL, 0x2);
+
+    *(void**)(&boolFromLongFunc) = dlsym(main_hndl, "PyBool_FromLong");
     CHECK_NULL(boolFromLongFunc, "PyBool_FromLong not found.\n", 7);
 
     PyObject_HasAttrString pyHasAttrFunc;
-    *(void**)(&pyHasAttrFunc) = dlsym(0, "PyObject_HasAttrString");
+    *(void**)(&pyHasAttrFunc) = dlsym(main_hndl, "PyObject_HasAttrString");
     CHECK_NULL(pyHasAttrFunc, "PyObject_HasAttrString not found.\n", 7);
 
     //Important: we need a non-blocking import here: PyImport_ImportModule
     //could end up crashing (this makes us work only from 2.6 onwards).
     PyImport_ImportModuleNoBlock pyImportModFunc;
-    *(void**)(&pyImportModFunc) = dlsym(0, "PyImport_ImportModuleNoBlock");
+    *(void**)(&pyImportModFunc) = dlsym(main_hndl, "PyImport_ImportModuleNoBlock");
     CHECK_NULL(pyImportModFunc, "PyImport_ImportModuleNoBlock not found.\n", 8);
 
 
@@ -232,14 +239,14 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
 
     if(!pyHasAttrFunc(pydevdTracingMod.ToPython(), "_original_settrace")){
         if(showDebugInfo){
-            printf("pydevd_tracing module has no _original_settrace! ");
+            printf("pydevd_tracing module has no _original_settrace!\n");
         }
         return 8;
     }
 
 
     PyObject_GetAttrString pyGetAttr;
-    *(void**)(&pyGetAttr) = dlsym(0, "PyObject_GetAttrString");
+    *(void**)(&pyGetAttr) = dlsym(main_hndl, "PyObject_GetAttrString");
     CHECK_NULL(pyGetAttr, "PyObject_GetAttrString not found.\n", 8);
 
     auto PyObjectHolder settrace = PyObjectHolder(isDebug, pyGetAttr(pydevdTracingMod.ToPython(), "_original_settrace"));
@@ -252,7 +259,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     CHECK_NULL(getGlobalDebugger.ToPython(), "pydevd.GetGlobalDebugger null.\n", 11);
 
     PyObject_CallFunctionObjArgs call;
-    *(void**)(&call) = dlsym(0, "PyObject_CallFunctionObjArgs");
+    *(void**)(&call) = dlsym(main_hndl, "PyObject_CallFunctionObjArgs");
     CHECK_NULL(call, "PyObject_CallFunctionObjArgs not found.\n", 11);
 
     auto PyObjectHolder globalDbg = PyObjectHolder(isDebug, call(getGlobalDebugger.ToPython(), NULL));
@@ -270,7 +277,7 @@ int _PYDEVD_ExecWithGILSetSysStrace(bool showDebugInfo, bool isDebug){
     
     DecRef(call(settrace.ToPython(), traceFunc.ToPython(), NULL), isDebug);
     if(showDebugInfo){
-        printf("sys.settrace(pydevd.GetGlobalDebugger().trace_dispatch) worked.");
+        printf("sys.settrace(pydevd.GetGlobalDebugger().trace_dispatch) worked.\n");
     }
 
     return 0;
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
new file mode 100644
index 000000000000..b457e1547cd2
--- /dev/null
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/lldb_threads_settrace.py
@@ -0,0 +1,36 @@
+# This file is meant to be run inside lldb as a command after
+# the attach_linux.dylib dll has already been loaded to settrace for all threads.
+def __lldb_init_module(debugger, internal_dict):
+    # Command Initialization code goes here
+    print('Startup LLDB in Python!')
+    import lldb
+
+    try:
+        show_debug_info = 1
+        is_debug = 0
+        target = debugger.GetSelectedTarget()
+        if target:
+            process = target.GetProcess()
+            if process:
+                for thread in process:
+                    # Get the first frame
+                    print('Thread %s, suspended %s\n'%(thread, thread.IsStopped()))
+
+                    process.SetSelectedThread(thread)
+
+                    if not thread.IsStopped():
+                        error = process.Stop()
+                        print(error)
+
+                    if thread:
+                        frame = thread.GetSelectedFrame()
+                        if frame:
+                            print('Will settrace in: %s' % (frame,))
+                            res = frame.EvaluateExpression("(int) SetSysTraceFunc(%s, %s)" % (
+                                show_debug_info, is_debug), lldb.eDynamicCanRunTarget)
+                            error = res.GetError()
+                            if error:
+                                print(error)
+                    thread.Resume()
+    except:
+        import traceback;traceback.print_exc()
diff --git a/python/helpers/pydev/pydevd_attach_to_process/linux/python.h b/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
index f1a6d81434f9..93bfe6e413c9 100644
--- a/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
+++ b/python/helpers/pydev/pydevd_attach_to_process/linux/python.h
@@ -548,7 +548,8 @@ typedef const char* (*GetVersionFunc) ();
 
 static PythonVersion GetPythonVersion() {
     GetVersionFunc versionFunc;
-    *(void**)(&versionFunc) = dlsym(0, "Py_GetVersion");
+    void *main_hndl = dlopen(NULL, 0x2);
+    *(void**)(&versionFunc) = dlsym(main_hndl, "Py_GetVersion");
     if(versionFunc != NULL) {
         const char* version = versionFunc();
         if(version != NULL && strlen(version) >= 3 && version[1] == '.') {
diff --git a/python/helpers/pydev/pydevd_plugin_utils.py b/python/helpers/pydev/pydevd_plugin_utils.py
index f50bdf8425e8..4ccdfb44e3df 100644
--- a/python/helpers/pydev/pydevd_plugin_utils.py
+++ b/python/helpers/pydev/pydevd_plugin_utils.py
@@ -2,7 +2,7 @@ import types
 
 import pydev_log
 import pydevd_trace_api
-from third_party.pluginbase import PluginBase
+from _pydev_imps._pydev_pluginbase import PluginBase
 from pydevd_constants import *  # @UnusedWildImport
 
 def load_plugins(package):
diff --git a/python/helpers/pydev/pydevd_resolver.py b/python/helpers/pydev/pydevd_resolver.py
index cc67cd043cec..a1c7a1dfe40e 100644
--- a/python/helpers/pydev/pydevd_resolver.py
+++ b/python/helpers/pydev/pydevd_resolver.py
@@ -18,7 +18,7 @@ from pydevd_constants import DictIterItems, xrange
 
 # Note: 300 is already a lot to see in the outline (after that the user should really use the shell to get things)
 # and this also means we'll pass less information to the client side (which makes debugging faster).
-MAX_ITEMS_TO_HANDLE = 300
+MAX_ITEMS_TO_HANDLE = 300 
 
 TOO_LARGE_MSG = 'Too large to show contents. Max items to show: ' + str(MAX_ITEMS_TO_HANDLE)
 TOO_LARGE_ATTR = 'Unable to handle:'
@@ -284,11 +284,11 @@ class TupleResolver: #to enumerate tuples and lists
         for item in var:
             d[format_str % i] = item
             i += 1
-
+            
             if i > MAX_ITEMS_TO_HANDLE:
                 d[TOO_LARGE_ATTR] = TOO_LARGE_MSG
                 break
-
+                
         d['__len__'] = len(var)
         return d
 
@@ -319,12 +319,12 @@ class SetResolver:
         for item in var:
             i+= 1
             d[id(item)] = item
-
+            
             if i > MAX_ITEMS_TO_HANDLE:
                 d[TOO_LARGE_ATTR] = TOO_LARGE_MSG
                 break
 
-
+            
         d['__len__'] = len(var)
         return d
 
diff --git a/python/helpers/pydev/runfiles.py b/python/helpers/pydev/runfiles.py
index c2db611055c4..3e6c0d656b3a 100644
--- a/python/helpers/pydev/runfiles.py
+++ b/python/helpers/pydev/runfiles.py
@@ -190,6 +190,8 @@ def main():
 
             argv.append('-p')
             argv.append('pydev_runfiles_pytest2')
+            if 'unittest' in sys.modules or 'unittest2' in sys.modules:
+                sys.stderr.write('pydev test runner error: imported unittest before running pytest.main\n')
             return pytest.main(argv)
 
         else:
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
index d54bac8de85f..834916b0cf2b 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
@@ -359,6 +359,13 @@ public class MultiProcessDebugger implements ProcessDebugger {
     }
   }
 
+  @Override
+  public void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName) {
+    for (ProcessDebugger d : allDebuggers()) {
+      d.setBreakpointWithFuncName(typeId, file, line, condition, logExpression, funcName);
+    }
+  }
+
   @Override
   public void removeBreakpoint(String typeId, String file, int line) {
     for (ProcessDebugger d : allDebuggers()) {
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
index 0fa5a5c21931..22344434252b 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
@@ -78,6 +78,8 @@ public interface ProcessDebugger {
 
   void setBreakpoint(String typeId, String file, int line, String condition, String logExpression);
 
+  void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName);
+
   void removeBreakpoint(String typeId, String file, int line);
 
   void addCloseListener(RemoteDebuggerCloseListener remoteDebuggerCloseListener);
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index 4ce7bdf67434..2d97a3fb1a7e 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -436,6 +436,16 @@ public class RemoteDebugger implements ProcessDebugger {
     execute(command);
   }
 
+  @Override
+  public void setBreakpointWithFuncName(String typeId, String file, int line, String condition, String logExpression, String funcName) {
+    final SetBreakpointCommand command =
+      new SetBreakpointCommand(this, typeId, file, line,
+                               condition,
+                               logExpression,
+                               funcName);
+    execute(command);
+  }
+
   @Override
   public void removeBreakpoint(String typeId, String file, int line) {
     final RemoveBreakpointCommand command =
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index dbeb5dedfd7c..532e374d5c74 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -24,6 +24,7 @@ import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -34,6 +35,9 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.remote.RemoteProcessHandlerBase;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xdebugger.*;
@@ -44,9 +48,11 @@ import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import com.intellij.xdebugger.stepping.XSmartStepIntoHandler;
+import com.jetbrains.python.PythonFileType;
 import com.jetbrains.python.console.PythonDebugLanguageConsoleView;
 import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.pydev.*;
+import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.run.PythonProcessHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -594,12 +600,36 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
     return frame;
   }
 
+  private String getFunctionName(final XLineBreakpoint breakpoint) {
+    final VirtualFile file = breakpoint.getSourcePosition().getFile();
+    final Document document = FileDocumentManager.getInstance().getDocument(file);
+    final Project project = getSession().getProject();
+    final String[] funcName = new String[1];
+    if (document != null) {
+      if (file.getFileType() == PythonFileType.INSTANCE) {
+        ApplicationManager.getApplication().runReadAction(new Runnable() {
+          @Override
+          public void run() {
+            PsiElement psiElement = XDebuggerUtil.getInstance().findContextElement(file, breakpoint.getSourcePosition().getOffset(),
+                                                                                   project, false);
+            PyFunction function = PsiTreeUtil.getParentOfType(psiElement, PyFunction.class);
+            if (function != null) {
+              funcName[0] = function.getName();
+            }
+          }
+        });
+      }
+    }
+    return funcName[0];
+  }
+
   public void addBreakpoint(final PySourcePosition position, final XLineBreakpoint breakpoint) {
     myRegisteredBreakpoints.put(position, breakpoint);
     if (isConnected()) {
-      myDebugger.setBreakpoint(breakpoint.getType().getId(), position.getFile(), position.getLine(),
-                               breakpoint.getCondition(),
-                               breakpoint.getLogExpression());
+      myDebugger.setBreakpointWithFuncName(breakpoint.getType().getId(), position.getFile(), position.getLine(),
+                                           breakpoint.getCondition(),
+                                           breakpoint.getLogExpression(),
+                                           getFunctionName(breakpoint));
     }
   }
 
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
index 8b65e34ad3ca..82f61cfb1b57 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/AddEncodingQuickFix.java
@@ -17,8 +17,15 @@ package com.jetbrains.python.inspections.quickfix;
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiComment;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.jetbrains.python.PyBundle;
@@ -32,13 +39,13 @@ import org.jetbrains.annotations.NotNull;
  * add missing encoding declaration
  * # -*- coding: <encoding name> -*-
  * to the source file
- *
+ * <p/>
  * User: catherine
  */
 public class AddEncodingQuickFix implements LocalQuickFix {
 
-  private String myDefaultEncoding;
-  private int myEncodingFormatIndex;
+  private final String myDefaultEncoding;
+  private final int myEncodingFormatIndex;
 
   public AddEncodingQuickFix(String defaultEncoding, int encodingFormatIndex) {
     myDefaultEncoding = defaultEncoding;
@@ -57,14 +64,28 @@ public class AddEncodingQuickFix implements LocalQuickFix {
   }
 
   public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
-    PsiFile file = descriptor.getPsiElement().getContainingFile();
+    final PsiElement element = descriptor.getPsiElement();
+    final PsiFile file = element.getContainingFile();
     if (file == null) return;
     PsiElement firstLine = file.getFirstChild();
     if (firstLine instanceof PsiComment && firstLine.getText().startsWith("#!")) {
       firstLine = firstLine.getNextSibling();
     }
-    PsiComment encodingLine = PyElementGenerator.getInstance(project).createFromText(LanguageLevel.forElement(file), PsiComment.class,
-                                                                                     String.format(PyEncodingUtil.ENCODING_FORMAT_PATTERN[myEncodingFormatIndex], myDefaultEncoding));
-    file.addBefore(encodingLine, firstLine);
+    final String commentText = String.format(PyEncodingUtil.ENCODING_FORMAT_PATTERN[myEncodingFormatIndex], myDefaultEncoding);
+    final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
+    PsiComment encodingComment = elementGenerator.createFromText(LanguageLevel.forElement(file), PsiComment.class, commentText);
+    encodingComment = (PsiComment)file.addBefore(encodingComment, firstLine);
+
+    final FileEditor fileEditor = FileEditorManager.getInstance(project).getSelectedEditor(element.getContainingFile().getVirtualFile());
+    if (fileEditor instanceof TextEditor) {
+      final Editor editor = ((TextEditor)fileEditor).getEditor();
+      final Document document = editor.getDocument();
+      final int insertedLineNumber = document.getLineNumber(encodingComment.getTextOffset());
+      if (insertedLineNumber == document.getLineCount() - 1) {
+        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
+        document.insertString(document.getLineEndOffset(insertedLineNumber), "\n");
+      }
+      editor.getCaretModel().moveToLogicalPosition(new LogicalPosition(insertedLineNumber + 1, 0));
+    }
   }
 }
diff --git a/python/testData/inspections/AddEncodingInEmptyFile.py b/python/testData/inspections/AddEncodingInEmptyFile.py
new file mode 100644
index 000000000000..376db9193fc4
--- /dev/null
+++ b/python/testData/inspections/AddEncodingInEmptyFile.py
@@ -0,0 +1 @@
+<warning descr="No encoding specified for file"><caret></warning>
diff --git a/python/testData/inspections/AddEncodingInEmptyFile_after.py b/python/testData/inspections/AddEncodingInEmptyFile_after.py
new file mode 100644
index 000000000000..76ea4ea7c759
--- /dev/null
+++ b/python/testData/inspections/AddEncodingInEmptyFile_after.py
@@ -0,0 +1,2 @@
+# coding=utf-8
+<caret>
\ No newline at end of file
diff --git a/python/testData/inspections/AddEncoding_after.py b/python/testData/inspections/AddEncoding_after.py
index ef08f90863b7..974d8ff7f054 100644
--- a/python/testData/inspections/AddEncoding_after.py
+++ b/python/testData/inspections/AddEncoding_after.py
@@ -1,2 +1,2 @@
 # coding=utf-8
-c = "string"
+<caret>c = "string"
diff --git a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
index e49b0eaee6c8..c7e8d138aa83 100644
--- a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
+++ b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java
@@ -349,11 +349,18 @@ public class PyQuickFixTest extends PyTestCase {
                      PyBundle.message("QFIX.add.super"), true, true);
   }
 
-  public void testAddEncoding() {                      //PY-491
+  //PY-491, PY-13297
+  public void testAddEncoding() {
     doInspectionTest("AddEncoding.py", PyMandatoryEncodingInspection.class,
                      PyBundle.message("QFIX.add.encoding"), true, true);
   }
 
+  // PY-13297
+  public void testAddEncodingInEmptyFile() {
+    doInspectionTest("AddEncodingInEmptyFile.py", PyMandatoryEncodingInspection.class,
+                     PyBundle.message("QFIX.add.encoding"), true, true);
+  }
+
   public void testRemoveDecorator() {                      //PY-3348
     doInspectionTest("RemoveDecorator.py", PyDecoratorInspection.class,
                      PyBundle.message("QFIX.remove.decorator"), true, true);
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
index 01ddc3ca563f..57dc97700a74 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
@@ -313,7 +313,7 @@ public class XmlEmmetParser extends EmmetParser {
     }
 
     if (token == ZenCodingTokens.DOT || token == ZenCodingTokens.SHARP) {
-      final String name = token == ZenCodingTokens.DOT ? CLASS : ID;
+      final String name = getAttributeName(token);
       advance();
       token = getToken();
       final String value = getAttributeValueByToken(token);
@@ -326,6 +326,10 @@ public class XmlEmmetParser extends EmmetParser {
     return null;
   }
 
+  protected String getAttributeName(ZenCodingToken delimiterToken) {
+    return delimiterToken == ZenCodingTokens.DOT ? CLASS : ID;
+  }
+
   @Nullable
   private List<Couple<String>> parseAttributeList() {
     final List<Couple<String>> result = new ArrayList<Couple<String>>();
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
index b15df8b5da2e..846eb867d844 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
@@ -61,8 +61,8 @@ public abstract class ZenCodingGenerator {
 
   public static List<ZenCodingGenerator> getInstances() {
     List<ZenCodingGenerator> generators = new ArrayList<ZenCodingGenerator>();
-    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     Collections.addAll(generators, EP_NAME.getExtensions());
+    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     return generators;
   }
 
diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
index 271fd5b6ff3d..1b416f37b92d 100644
--- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
+++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java
@@ -19,6 +19,7 @@ import com.intellij.lang.Language;
 import com.intellij.lang.LanguageDocumentation;
 import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.lang.documentation.DocumentationUtil;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
@@ -273,7 +274,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider {
     if (result== null && styleProvider !=null) {
       result = styleProvider.getDocumentationElementForLink(psiManager, link, context);
     }
-    if (result== null && ourScriptProvider !=null) {
+    if (result== null && ourScriptProvider != null && !DumbService.isDumb(psiManager.getProject())) {
       result = ourScriptProvider.getDocumentationElementForLink(psiManager, link,context);
     }
     return result;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
index b74834a28162..ee6248b6c1bf 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java
@@ -16,7 +16,10 @@
 package com.intellij.psi.impl.source.xml;
 
 import com.intellij.ide.highlighter.DTDFileType;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.RecursionManager;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.search.PsiElementProcessor;
@@ -49,8 +52,6 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
     super(XmlElementType.XML_ENTITY_REF);
   }
 
-  private static final Key<String> EVALUATION_IN_PROCESS = Key.create("EvalKey");
-
   @Override
   public XmlEntityDecl resolve(PsiFile targetFile) {
     String text = getText();
@@ -77,12 +78,12 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
       if (value == null) {
         final PsiManager manager = element.getManager();
         if(manager == null){
-          return resolveEntity(targetElement, entityName, containingFile).getValue();
+          return doResolveEntity(targetElement, entityName, containingFile).getValue();
         }
         value = CachedValuesManager.getManager(manager.getProject()).createCachedValue(new CachedValueProvider<XmlEntityDecl>() {
           @Override
           public Result<XmlEntityDecl> compute() {
-            return resolveEntity(targetElement, entityName, containingFile);
+            return doResolveEntity(targetElement, entityName, containingFile);
           }
         });
 
@@ -95,95 +96,94 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
 
   private static final Key<Boolean> DISABLE_ENTITY_EXPAND = Key.create("disable.entity.expand");
 
-  private static CachedValueProvider.Result<XmlEntityDecl> resolveEntity(final PsiElement targetElement, final String entityName, PsiFile contextFile) {
-    if (targetElement.getUserData(EVALUATION_IN_PROCESS) != null) {
-      return new CachedValueProvider.Result<XmlEntityDecl>(null,targetElement);
-    }
-    try {
-      targetElement.putUserData(EVALUATION_IN_PROCESS, "");
-      final List<PsiElement> deps = new ArrayList<PsiElement>();
-      final XmlEntityDecl[] result = {null};
+  private static CachedValueProvider.Result<XmlEntityDecl> doResolveEntity(final PsiElement targetElement,
+                                                                           final String entityName,
+                                                                           final PsiFile contextFile) {
+    return RecursionManager.doPreventingRecursion(targetElement, true, new Computable<CachedValueProvider.Result<XmlEntityDecl>>() {
+      @Override
+      public CachedValueProvider.Result<XmlEntityDecl> compute() {
+        final List<PsiElement> deps = new ArrayList<PsiElement>();
+        final XmlEntityDecl[] result = {null};
 
-      PsiElementProcessor processor = new PsiElementProcessor() {
-        @Override
-        public boolean execute(@NotNull PsiElement element) {
-          if (element instanceof XmlDoctype) {
-            XmlDoctype xmlDoctype = (XmlDoctype)element;
-            final String dtdUri = getDtdForEntity(xmlDoctype);
-            if (dtdUri != null) {
-              XmlFile file = XmlUtil.getContainingFile(element);
-              if (file == null) return true;
-              final XmlFile xmlFile = XmlUtil.findNamespace(file, dtdUri);
-              if (xmlFile != null) {
-                if (xmlFile != targetElement) {
-                  deps.add(xmlFile);
-                  if(!XmlUtil.processXmlElements(xmlFile, this,true)) return false;
+        PsiElementProcessor processor = new PsiElementProcessor() {
+          @Override
+          public boolean execute(@NotNull PsiElement element) {
+            if (element instanceof XmlDoctype) {
+              XmlDoctype xmlDoctype = (XmlDoctype)element;
+              final String dtdUri = getDtdForEntity(xmlDoctype);
+              if (dtdUri != null) {
+                XmlFile file = XmlUtil.getContainingFile(element);
+                if (file == null) return true;
+                final XmlFile xmlFile = XmlUtil.findNamespace(file, dtdUri);
+                if (xmlFile != null) {
+                  if (xmlFile != targetElement) {
+                    deps.add(xmlFile);
+                    if (!XmlUtil.processXmlElements(xmlFile, this, true)) return false;
+                  }
                 }
               }
+              final XmlMarkupDecl markupDecl = xmlDoctype.getMarkupDecl();
+              if (markupDecl != null) {
+                if (!XmlUtil.processXmlElements(markupDecl, this, true)) return false;
+              }
             }
-            final XmlMarkupDecl markupDecl = xmlDoctype.getMarkupDecl();
-            if (markupDecl != null) {
-              if (!XmlUtil.processXmlElements(markupDecl, this, true)) return false;
+            else if (element instanceof XmlEntityDecl) {
+              XmlEntityDecl entityDecl = (XmlEntityDecl)element;
+              final String declName = entityDecl.getName();
+              if (StringUtil.equals(declName, entityName)) {
+                result[0] = entityDecl;
+                return false;
+              }
             }
+
+            return true;
           }
-          else if (element instanceof XmlEntityDecl) {
-            XmlEntityDecl entityDecl = (XmlEntityDecl)element;
-            final String declName = entityDecl.getName();
-            if (declName.equals(entityName)) {
-              result[0] = entityDecl;
-              return false;
-            }
+        };
+        FileViewProvider provider = targetElement.getContainingFile().getViewProvider();
+        deps.add(provider.getPsi(provider.getBaseLanguage()));
+
+        boolean notfound = PsiTreeUtil.processElements(targetElement, processor);
+        if (notfound) {
+          if (contextFile != targetElement && contextFile != null && contextFile.isValid()) {
+            notfound = PsiTreeUtil.processElements(contextFile, processor);
           }
-
-          return true;
         }
-      };
-      FileViewProvider provider = targetElement.getContainingFile().getViewProvider();
-      deps.add(provider.getPsi(provider.getBaseLanguage()));
 
-      boolean notfound = PsiTreeUtil.processElements(targetElement, processor);
-      if (notfound) {
-        if (contextFile != targetElement && contextFile != null && contextFile.isValid()) {
-          notfound = PsiTreeUtil.processElements(contextFile, processor);
-        }
-      }
+        if (notfound &&       // no dtd ref at all
+            targetElement instanceof XmlFile &&
+            deps.size() == 1 &&
+            ((XmlFile)targetElement).getFileType() != DTDFileType.INSTANCE
+          ) {
+          XmlDocument document = ((XmlFile)targetElement).getDocument();
+          final XmlTag rootTag = document != null ? document.getRootTag() : null;
+          XmlFile descriptorFile = null;
 
-      if (notfound &&       // no dtd ref at all
-          targetElement instanceof XmlFile &&
-          deps.size() == 1 &&
-          ((XmlFile)targetElement).getFileType() != DTDFileType.INSTANCE
-         ) {
-        XmlDocument document = ((XmlFile)targetElement).getDocument();
-        final XmlTag rootTag = document.getRootTag();
-        XmlFile descriptorFile = null;
-
-        if (HtmlUtil.isHtml5Document(document)) {
-          descriptorFile = XmlUtil.findXmlFile((XmlFile)targetElement, Html5SchemaProvider.getCharsDtdLocation());
-        } else if (rootTag != null && document.getUserData(DISABLE_ENTITY_EXPAND) == null) {
-          final XmlElementDescriptor descriptor = rootTag.getDescriptor();
+          if (HtmlUtil.isHtml5Document(document)) {
+            descriptorFile = XmlUtil.findXmlFile((XmlFile)targetElement, Html5SchemaProvider.getCharsDtdLocation());
+          }
+          else if (rootTag != null && document.getUserData(DISABLE_ENTITY_EXPAND) == null) {
+            final XmlElementDescriptor descriptor = rootTag.getDescriptor();
 
             if (descriptor != null && !(descriptor instanceof AnyXmlElementDescriptor)) {
               PsiElement element = descriptor.getDeclaration();
-              final PsiFile containingFile = element != null ? element.getContainingFile():null;
-              descriptorFile = containingFile instanceof XmlFile ? (XmlFile)containingFile:null;
+              final PsiFile containingFile = element != null ? element.getContainingFile() : null;
+              descriptorFile = containingFile instanceof XmlFile ? (XmlFile)containingFile : null;
             }
+          }
+          if (descriptorFile != null &&
+              !descriptorFile.getName().equals(((XmlFile)targetElement).getName() + ".dtd")) {
+            deps.add(descriptorFile);
+            XmlUtil.processXmlElements(
+              descriptorFile,
+              processor,
+              true
+            );
+          }
         }
-        if (descriptorFile != null &&
-            !descriptorFile.getName().equals(((XmlFile)targetElement).getName() + ".dtd")) {
-          deps.add(descriptorFile);
-          XmlUtil.processXmlElements(
-            descriptorFile,
-            processor,
-            true
-          );
-        }
-      }
 
-      return new CachedValueProvider.Result<XmlEntityDecl>(result[0], ArrayUtil.toObjectArray(deps));
-    }
-    finally {
-      targetElement.putUserData(EVALUATION_IN_PROCESS, null);
-    }
+        return new CachedValueProvider.Result<XmlEntityDecl>(result[0], ArrayUtil.toObjectArray(deps));
+      }
+    });
   }
 
   private static String getDtdForEntity(XmlDoctype xmlDoctype) {
@@ -214,7 +214,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef {
   @Override
   @NotNull
   public PsiReference[] getReferences() {
-    return ReferenceProvidersRegistry.getReferencesFromProviders(this,XmlEntityRef.class);
+    return ReferenceProvidersRegistry.getReferencesFromProviders(this);
   }
 
   @Override
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
index 3525a00163a7..b5c24bbe070b 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlPsiManager.java
@@ -21,7 +21,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFileSystemItem;
 import com.intellij.psi.impl.PsiManagerImpl;
+import com.intellij.psi.impl.PsiTreeChangeEventImpl;
 import com.intellij.psi.impl.PsiTreeChangePreprocessorBase;
+import com.intellij.psi.xml.XmlFile;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created by fedorkorotkov.
@@ -52,6 +55,12 @@ public class XmlPsiManager extends AbstractProjectComponent {
         // cause we display even attributes and tag values in structure view
         return !isXml;
       }
+
+      @Override
+      public void treeChanged(@NotNull PsiTreeChangeEventImpl event) {
+        if (!(event.getFile() instanceof XmlFile)) return;
+        super.treeChanged(event);
+      }
     };
   }
 }