diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index dfeffe932b26..db49c1719e0b 100644
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -4,7 +4,7 @@
     <log_file path="$PROJECT_DIR$/system/log/build-log/build.log" checked="true" skipped="true" show_all="false" alias="build.log" />
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx512m -XX:ReservedCodeCacheSize=150m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -ea -Xbootclasspath/p:../out/classes/production/boot -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -Dapple.laf.useScreenMenuBar=true -Dsun.awt.disablegrab=true -Didea.jre.check=true -Didea.is.internal=true -Didea.debug.mode=true -Didea.config.path=../config -Didea.system.path=../system" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -XX:ReservedCodeCacheSize=150m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -XX:MaxJavaStackTraceDepth=10000 -ea -Xbootclasspath/a:../out/classes/production/boot -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -Dapple.laf.useScreenMenuBar=true -Dsun.awt.disablegrab=true -Didea.jre.check=true -Didea.is.internal=true -Didea.debug.mode=true -Didea.config.path=../config -Didea.system.path=../system" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index 08811358451a..7df94672fb65 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -147,17 +147,6 @@ BITS=$?
 "$RM" -f "$VERSION_LOG"
 test ${BITS} -eq 0 && BITS="64" || BITS=""
 
-#----------------------------------------------------------------------
-# Set platform enviroment variables for IDE
-#----------------------------------------------------------------------
-if [ "$OS_TYPE" = "Linux" ] ; then
-  case "$XDG_CURRENT_DESKTOP" in
-    *Unity*)
-      export JAYATANA_FORCE=true
-      ;;
-  esac
-fi
-
 # ---------------------------------------------------------------------
 # Collect JVM options and IDE properties.
 # ---------------------------------------------------------------------
diff --git a/build/dependencies/gradle.properties b/build/dependencies/gradle.properties
index 4da6c636deb9..9143839a3240 100644
--- a/build/dependencies/gradle.properties
+++ b/build/dependencies/gradle.properties
@@ -1,4 +1,4 @@
 # The file might be automatically updated. Comments and empty lines will be removed.
 kotlinPluginBuild=1.1.2-release-IJ2017.2-1
 jetSignBuild=42.30
-jdkBuild=u152b915.1
+jdkBuild=u152b927.1
diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java
index a741b77035eb..d2afd2168294 100644
--- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/ChainSearcher.java
@@ -48,7 +48,7 @@ public class ChainSearcher {
       if (methods == null) {
         methods = currentMethods;
       } else {
-        methods.addAll(currentMethods);
+        methods = unionSortedSet(currentMethods, methods);
       }
     }
     return new SearchInitializer(methods, context);
@@ -169,4 +169,13 @@ public class ChainSearcher {
       result.add(newChain);
     }
   }
+
+  private static <T> SortedSet<T> unionSortedSet(SortedSet<T> s1, SortedSet<T> s2) {
+    if (s1.isEmpty()) return s2;
+    if (s2.isEmpty()) return s1;
+    TreeSet<T> result = new TreeSet<>();
+    result.addAll(s1);
+    result.addAll(s2);
+    return result;
+  }
 }
\ No newline at end of file
diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java
index 12d24b20b99f..4aafcfc9ac7f 100644
--- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java
+++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/lookup/ChainCompletionNewVariableLookupElement.java
@@ -57,7 +57,6 @@ public class ChainCompletionNewVariableLookupElement extends LookupElement {
   @Override
   public void handleInsert(final InsertionContext context) {
     final PsiFile file = context.getFile();
-    ((PsiJavaFile)file).importClass(myQualifierClass);
     final PsiElement caretElement = ObjectUtils.notNull(file.findElementAt(context.getEditor().getCaretModel().getOffset()));
 
     final PsiStatement statement = PsiTreeUtil.getParentOfType(caretElement.getPrevSibling(), PsiStatement.class, false);
@@ -67,8 +66,8 @@ public class ChainCompletionNewVariableLookupElement extends LookupElement {
     final PsiStatement newVarDeclarationTemplate = elementFactory.createVariableDeclarationStatement(myNewVarName,
                                                                                                      elementFactory.createType(myQualifierClass),
                                                                                                      elementFactory.createExpressionFromText(PsiKeyword.NULL, null));
-
-    statement.getParent().addBefore(newVarDeclarationTemplate, statement);
+    PsiElement varDeclaration = statement.getParent().addBefore(newVarDeclarationTemplate, statement);
+    JavaCodeStyleManager.getInstance(context.getProject()).shortenClassReferences(varDeclaration);
   }
 
   @NotNull
diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
index 518d22b9f75d..f1ea73d6fe5d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
+++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
@@ -246,7 +246,7 @@ public class ChainCompletionContext {
     if (element instanceof PsiMethod) {
       return ((PsiMethod)element).getReturnType();
     }
-    throw new AssertionError(element);
+    return null;
   }
 
   public static boolean isWidelyUsed(@NotNull PsiType type) {
diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
index 65a8b514d396..94458b9a1a65 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
@@ -86,8 +86,8 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce
 
 
   private static boolean isAppletClass(final PsiClass aClass, final PsiManager manager) {
+    if (DumbService.isDumb(manager.getProject())) return false;
     if (!PsiClassUtil.isRunnableClass(aClass, true)) return false;
-    if (DumbService.isDumb(manager.getProject())) return true;
 
     final Module module = JavaExecutionUtil.findModule(aClass);
     final GlobalSearchScope scope = module != null
diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryAttachDialog.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryAttachDialog.java
index 7065d88883c4..55dc8a4a3b75 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryAttachDialog.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryAttachDialog.java
@@ -47,14 +47,24 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.aether.ArtifactRepositoryManager;
 import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.JTextComponent;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -118,6 +128,12 @@ public class RepositoryAttachDialog extends DialogWrapper {
       protected void textChanged(DocumentEvent e) {
         ApplicationManager.getApplication().invokeLater(() -> {
           if (myProgressIcon.isDisposed()) return;
+          ApplicationManager.getApplication().invokeLater(() -> {
+            if (myProgressIcon.isDisposed()) return;
+            handleMavenDependencyInsertion(e, textField);
+            updateComboboxSelection(false);
+          });
+
           updateComboboxSelection(false);
         });
       }
@@ -163,6 +179,30 @@ public class RepositoryAttachDialog extends DialogWrapper {
     init();
   }
 
+  private static void handleMavenDependencyInsertion(DocumentEvent e, JTextField textField) {
+    if (e.getType() == DocumentEvent.EventType.INSERT) {
+      String text = textField.getText();
+      if (isMvnDependency(text)) {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setValidating(false);
+        try {
+          DocumentBuilder builder = factory.newDocumentBuilder();
+          try {
+            Document document = builder.parse(new InputSource(new StringReader(text)));
+            String mavenCoordinates = extractMavenCoordinates(document);
+            if (mavenCoordinates != null) {
+              textField.setText(mavenCoordinates);
+            }
+          }
+          catch (SAXException | IOException ignored) {
+          }
+        }
+        catch (ParserConfigurationException ignored) {
+        }
+      }
+    }
+  }
+
   public boolean getAttachJavaDoc() {
     return myJavaDocCheckBox.isSelected();
   }
@@ -348,4 +388,46 @@ public class RepositoryAttachDialog extends DialogWrapper {
   private void createUIComponents() {
     myProgressIcon = new AsyncProcessIcon("Progress");
   }
+
+  private static boolean isMvnDependency(String text) {
+    String trimmed = text.trim();
+    if (trimmed.startsWith("<dependency>") && trimmed.endsWith("</dependency>")) {
+      return true;
+    }
+    return false;
+  }
+
+  @Nullable
+  private static String extractMavenCoordinates(Document document) {
+    String groupId = getGroupId(document);
+    String artifactId = getArtifactId(document);
+    if (groupId.isEmpty() && artifactId.isEmpty()) {
+      return null;
+    }
+    String version = getVersion(document);
+    String classifier = getClassifier(document);
+    String gradleClassifier = classifier.isEmpty() ? "" : ":" + classifier;
+    return groupId + ":" + artifactId + ":" + version + gradleClassifier;
+  }
+
+  private static String getVersion(@NotNull Document document) {
+    return firstOrEmpty(document.getElementsByTagName("version"));
+  }
+
+  private static String getArtifactId(@NotNull Document document) {
+    return firstOrEmpty(document.getElementsByTagName("artifactId"));
+  }
+
+  private static String getGroupId(@NotNull Document document) {
+    return firstOrEmpty(document.getElementsByTagName("groupId"));
+  }
+
+  private static String getClassifier(@NotNull Document document) {
+    return firstOrEmpty(document.getElementsByTagName("classifier"));
+  }
+
+  private static String firstOrEmpty(@NotNull NodeList list) {
+    Node first = list.item(0);
+    return first != null ? first.getTextContent() : "";
+  }
 }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
index 2b6589177318..00035f38a964 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ClassDataIndexer.java
@@ -71,6 +71,7 @@ public class ClassDataIndexer implements VirtualFileGist.GistCalculator<Map<HMet
     try {
       MessageDigest md = BytecodeAnalysisConverter.getMessageDigest();
       Map<EKey, Equations> allEquations = processClass(new ClassReader(file.contentsToByteArray(false)), file.getPresentableUrl());
+      allEquations = solvePartially(allEquations);
       allEquations.forEach((methodKey, equations) -> map.put(methodKey.method.hashed(md), hash(equations, md)));
     }
     catch (ProcessCanceledException e) {
@@ -85,6 +86,20 @@ public class ClassDataIndexer implements VirtualFileGist.GistCalculator<Map<HMet
     return map;
   }
 
+  private static Map<EKey, Equations> solvePartially(Map<EKey, Equations> map) {
+    PuritySolver solver = new PuritySolver();
+    EntryStream.of(map).mapToKey((key, eqs) -> new EKey(key.method, Pure, eqs.stable, false))
+      .flatMapValues(eqs -> eqs.results.stream().map(drp -> drp.result))
+      .selectValues(Effects.class)
+      .forKeyValue(solver::addEquation);
+    Map<EKey, Effects> solved = solver.solve();
+    Map<EKey, Effects> partiallySolvedPurity =
+      StreamEx.of(solved, solver.pending).flatMapToEntry(Function.identity()).removeValues(Effects::isTop).toMap();
+    return EntryStream.of(map)
+      .mapToValue((key, eqs) -> eqs.update(Pure, partiallySolvedPurity.get(new EKey(key.method, Pure, eqs.stable, false))))
+      .toMap();
+  }
+
   private static Equations hash(Equations equations, MessageDigest md) {
     return new Equations(ContainerUtil.map(equations.results, drp -> hash(drp, md)), equations.stable);
   }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java
index ffeb0e6a8a1b..333aaf086e42 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java
@@ -15,12 +15,11 @@
  */
 package com.intellij.codeInspection.bytecodeAnalysis;
 
+import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Stream;
 
 /**
@@ -129,6 +128,15 @@ class Equations {
   public int hashCode() {
     return 31 * results.hashCode() + (stable ? 1 : 0);
   }
+
+  @NotNull
+  Equations update(Direction direction, Effects newResult) {
+    List<DirectionResultPair> newPairs = StreamEx.of(this.results)
+      .map(drp -> drp.updateForDirection(direction, newResult))
+      .nonNull()
+      .toList();
+    return new Equations(newPairs, this.stable);
+  }
 }
 
 class DirectionResultPair {
@@ -159,6 +167,16 @@ class DirectionResultPair {
   public String toString() {
     return Direction.fromInt(directionKey) + "->" + result;
   }
+
+  @Nullable
+  DirectionResultPair updateForDirection(Direction direction, Result newResult) {
+    if (this.directionKey == direction.asInt()) {
+      return newResult == null ? null : new DirectionResultPair(direction.asInt(), newResult);
+    }
+    else {
+      return this;
+    }
+  }
 }
 
 interface Result {}
@@ -227,6 +245,8 @@ final class Pending implements Result {
 }
 
 final class Effects implements Result {
+  static final Set<EffectQuantum> TOP_EFFECTS = Collections.singleton(EffectQuantum.TopEffectQuantum);
+
   @NotNull final DataValue returnValue;
   @NotNull final Set<EffectQuantum> effects;
 
@@ -239,6 +259,10 @@ final class Effects implements Result {
     return Stream.concat(returnValue.dependencies(), effects.stream().flatMap(EffectQuantum::dependencies));
   }
 
+  public boolean isTop() {
+    return returnValue == DataValue.UnknownDataValue1 && effects.equals(TOP_EFFECTS);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -254,6 +278,7 @@ final class Effects implements Result {
 
   @Override
   public String toString() {
-    return "Effects[" + effects.size() + "|" + returnValue + "]";
+    Object effectsPresentation = effects.isEmpty() ? "Pure" : effects.size() == 1 ? effects.iterator().next() : effects.size();
+    return "Effects[" + effectsPresentation + "|" + returnValue + "]";
   }
 }
\ No newline at end of file
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/PurityAnalysis.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/PurityAnalysis.java
index 7575ede44661..5ea806eb3fc8 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/PurityAnalysis.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/PurityAnalysis.java
@@ -66,7 +66,7 @@ public class PurityAnalysis {
     for (EffectQuantum effectQuantum : quanta) {
       if (effectQuantum != null) {
         if (effectQuantum == EffectQuantum.TopEffectQuantum) {
-          return returnValue == DataValue.UnknownDataValue1 ? null : new Equation(key, new Effects(returnValue, PuritySolver.TOP_EFFECTS));
+          return returnValue == DataValue.UnknownDataValue1 ? null : new Equation(key, new Effects(returnValue, Effects.TOP_EFFECTS));
         }
         effects.add(effectQuantum);
       }
@@ -559,11 +559,10 @@ class DataInterpreter extends Interpreter<DataValue> {
 }
 
 final class PuritySolver {
-  static final Set<EffectQuantum> TOP_EFFECTS = Collections.singleton(EffectQuantum.TopEffectQuantum);
   private HashMap<EKey, Effects> solved = new HashMap<>();
   private HashMap<EKey, Set<EKey>> dependencies = new HashMap<>();
   private final Stack<EKey> moving = new Stack<>();
-  private HashMap<EKey, Effects> pending = new HashMap<>();
+  HashMap<EKey, Effects> pending = new HashMap<>();
 
   void addEquation(EKey key, Effects effects) {
     Set<EKey> depKeys = effects.dependencies().collect(Collectors.toSet());
@@ -593,7 +592,7 @@ final class PuritySolver {
       }
       else {
         propagateKeys = new EKey[]{key.mkStable(), key};
-        propagateEffects = new Effects[]{effects, new Effects(DataValue.UnknownDataValue1, TOP_EFFECTS)};
+        propagateEffects = new Effects[]{effects, new Effects(DataValue.UnknownDataValue1, Effects.TOP_EFFECTS)};
       }
       for (int i = 0; i < propagateKeys.length; i++) {
         EKey pKey = propagateKeys[i];
@@ -615,7 +614,7 @@ final class PuritySolver {
                 EffectQuantum.CallQuantum call = substitute((EffectQuantum.CallQuantum)dEffect, pKey, pEffects);
                 if (call.key.equals(pKey)) {
                   delta = substitute(pEffects, call.data, call.isStatic);
-                  if(delta.equals(TOP_EFFECTS)) {
+                  if(delta.equals(Effects.TOP_EFFECTS)) {
                     newEffects = delta;
                     break;
                   }
@@ -630,7 +629,7 @@ final class PuritySolver {
                 EffectQuantum.ReturnChangeQuantum retChange = (EffectQuantum.ReturnChangeQuantum)dEffect;
                 if (retChange.key.equals(pKey)) {
                   if(pEffects.returnValue != DataValue.LocalDataValue) {
-                    newEffects = delta = TOP_EFFECTS;
+                    newEffects = delta = Effects.TOP_EFFECTS;
                     break;
                   }
                   continue;
@@ -639,8 +638,8 @@ final class PuritySolver {
               newEffects.add(dEffect);
             }
 
-            if (TOP_EFFECTS.equals(delta) && returnValue.equals(DataValue.UnknownDataValue1)) {
-              solved.put(dKey, new Effects(returnValue, TOP_EFFECTS));
+            if (Effects.TOP_EFFECTS.equals(delta) && returnValue.equals(DataValue.UnknownDataValue1)) {
+              solved.put(dKey, new Effects(returnValue, Effects.TOP_EFFECTS));
               moving.push(dKey);
             }
             else {
@@ -682,7 +681,7 @@ final class PuritySolver {
   }
 
   private static Set<EffectQuantum> substitute(Effects effects, DataValue[] data, boolean isStatic) {
-    if (effects.effects.isEmpty() || TOP_EFFECTS.equals(effects.effects)) {
+    if (effects.effects.isEmpty() || Effects.TOP_EFFECTS.equals(effects.effects)) {
       return effects.effects;
     }
     Set<EffectQuantum> newEffects = new HashSet<>(effects.effects.size());
@@ -710,7 +709,7 @@ final class PuritySolver {
         newEffects.add(new EffectQuantum.ReturnChangeQuantum(((DataValue.ReturnDataValue)arg).key));
         continue;
       }
-      return TOP_EFFECTS;
+      return Effects.TOP_EFFECTS;
     }
     return newEffects;
   }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
index 038bffddab53..98a20300cd22 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
@@ -199,6 +199,10 @@ public class HardcodedContracts {
     return className.startsWith("junit.framework.") || className.startsWith("org.junit.");
   }
 
+  private static boolean isJunit5(String className) {
+    return className.startsWith("org.junit.jupiter.");
+  }
+
   private static boolean isTestng(String className) {
     return className.startsWith("org.testng.");
   }
@@ -245,7 +249,7 @@ public class HardcodedContracts {
 
     if (paramCount == 0) return Collections.emptyList();
 
-    int checkedParam = testng ? 0 : paramCount - 1;
+    int checkedParam = testng || isJunit5(className) ? 0 : paramCount - 1;
     MethodContract.ValueConstraint[] constraints = createConstraintArray(paramCount);
     if ("assertTrue".equals(methodName) || "assumeTrue".equals(methodName)) {
       constraints[checkedParam] = FALSE_VALUE;
diff --git a/java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java b/java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
index 7e6b88826744..2078f03bc4ae 100644
--- a/java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
+++ b/java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
@@ -106,7 +106,10 @@ public class FunctionalInterfaceSuggester {
         }
 
         for (int i = 0; i < interfaceMethodParameters.length; i++) {
-          if (!TypeConversionUtil.isAssignable(parameters[i].getType(), substitutor.substitute(interfaceMethodParameters[i].getType()))) {
+          PsiType paramType = parameters[i].getType();
+          PsiType interfaceParamType = substitutor.substitute(interfaceMethodParameters[i].getType());
+          if (!(interfaceParamType instanceof PsiPrimitiveType
+                ? paramType.equals(interfaceParamType) : TypeConversionUtil.isAssignable(paramType, interfaceParamType))) {
             return null;
           }
         }
@@ -117,7 +120,7 @@ public class FunctionalInterfaceSuggester {
           return null;
         }
         
-        if (returnType instanceof PsiPrimitiveType && !returnType.equals(interfaceMethodReturnType)) {
+        if (interfaceMethodReturnType instanceof PsiPrimitiveType && !interfaceMethodReturnType.equals(returnType)) {
           return null;
         }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/objectsHashCode.vm b/java/java-impl/src/com/intellij/codeInsight/generation/objectsHashCode.vm
index c245f7b228e3..ef9565d0babd 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/objectsHashCode.vm
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/objectsHashCode.vm
@@ -2,19 +2,75 @@ public int hashCode() {
 #if (!$superHasHashCode && $fields.size()==1 && $fields[0].array)
   return java.util.Arrays.hashCode($fields[0].accessor);
 #else
-  return java.util.Objects.hash(##
-    #set($i = 0)
-    #if($superHasHashCode)
-     super.hashCode() ##
-     #set($i = 1)
+  #set($hasArrays = false)
+  #set($hasNoArrays = false)
+  #foreach($field in $fields)
+    #if ($field.array)
+      #set($hasArrays = true)
+    #else
+      #set($hasNoArrays = true)
+    #end
+  #end
+  
+  #if (!$hasArrays)
+    return java.util.Objects.hash(##
+      #set($i = 0)
+      #if($superHasHashCode)
+       super.hashCode() ##
+       #set($i = 1)
+      #end
+      #foreach($field in $fields)
+        #if ($i > 0)
+        , ##
+        #end
+        $field.accessor ##
+        #set($i = $i + 1)
+      #end
+    );
+  #else
+    #set($resultName = $helper.getUniqueLocalVarName("result", $fields, $settings))
+    #set($resultAssigned = false)
+    #set($resultDeclarationCompleted = false)
+    int $resultName ##
+    #if($hasNoArrays)
+      = java.util.Objects.hash(##
+        #set($i = 0)
+        #if($superHasHashCode)
+         super.hashCode() ##
+         #set($i = 1)
+        #end
+        #foreach($field in $fields)
+          #if(!$field.array)
+            #if ($i > 0)
+            , ##
+            #end
+            $field.accessor ##
+            #set($i = $i + 1)
+          #end
+        #end
+      );
+      #set($resultAssigned = true)
+      #set($resultDeclarationCompleted = true)
+    #elseif($superHasHashCode)
+       = super.hashCode(); ##
+      #set($resultAssigned = true)
+      #set($resultDeclarationCompleted = true)
     #end
     #foreach($field in $fields)
-      #if ($i > 0)
-      , ##
+      #if($field.array)
+        #if ($resultDeclarationCompleted)
+          $resultName ##
+        #end
+        = ##
+        #if ($resultAssigned)
+          31 * $resultName + ##
+        #end
+        java.util.Arrays.hashCode($field.accessor);
+        #set($resultAssigned = true)
+        #set($resultDeclarationCompleted = true)
       #end
-      $field.accessor ##
-      #set($i = $i + 1)
-    #end
-  );
+    #end  
+  return $resultName;
+  #end
 #end
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java
index d3966c0de56b..999bdf3b564b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -98,7 +98,7 @@ public class SurroundAutoCloseableAction extends PsiElementBaseIntentionAction {
       PsiElement sibling = element.getPrevSibling();
       if (sibling instanceof PsiDeclarationStatement) {
         PsiElement lastVar = ArrayUtil.getLastElement(((PsiDeclarationStatement)sibling).getDeclaredElements());
-        if (lastVar instanceof PsiLocalVariable) {
+        if (lastVar instanceof PsiLocalVariable && ((PsiLocalVariable)lastVar).getInitializer() != null) {
           return (PsiLocalVariable)lastVar;
         }
       }
diff --git a/java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java b/java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java
index 645d4dc8b713..190849e6e9bb 100644
--- a/java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java
@@ -193,7 +193,7 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo
     if(!hasNoBadRefs) return ProblemType.NONE;
     if (!hasOptionalReference.get() || !(lambdaCandidate instanceof PsiExpression)) return ProblemType.INFO;
     PsiExpression expression = (PsiExpression)lambdaCandidate;
-    if (!PsiType.VOID.equals(expression.getType()) && NullnessUtil.getExpressionNullness(expression) != Nullness.NOT_NULL) {
+    if (falseExpression != null && NullnessUtil.getExpressionNullness(expression) != Nullness.NOT_NULL) {
       return ProblemType.INFO;
     }
     return ProblemType.WARNING;
diff --git a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java
index 1f480ae2ba79..bda102be9a0c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java
@@ -52,6 +52,7 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
   public boolean mySuggestMapPutIfAbsent = true;
   public boolean mySuggestMapMerge = true;
   public boolean myTreatGetNullAsContainsKey = false;
+  public boolean mySideEffects = false;
 
   @Nullable
   @Override
@@ -62,6 +63,7 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
     panel.addCheckbox("Suggest conversion to Map.putIfAbsent", "mySuggestMapPutIfAbsent");
     panel.addCheckbox("Suggest conversion to Map.merge", "mySuggestMapMerge");
     panel.addCheckbox("Treat 'get(k) != null' the same as 'containsKey(k)' (may change semantics)", "myTreatGetNullAsContainsKey");
+    panel.addCheckbox("Suggest replacement even if lambda may have side effects", "mySideEffects");
     return panel;
   }
 
@@ -121,7 +123,9 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
           if (PsiTreeUtil.collectElements(presentValue, e -> PsiEquivalenceUtil.areElementsEquivalent(e, absentValue)).length == 0) {
             return;
           }
-          condition.register(holder, new ReplaceWithSingleMapOperation("merge", PsiTreeUtil
+          boolean informationLevel =
+            !mySideEffects && SideEffectChecker.mayHaveSideEffects(presentValue, ex -> condition.extractGetCall(ex) != null);
+          condition.register(holder, informationLevel, new ReplaceWithSingleMapOperation("merge", PsiTreeUtil
             .getParentOfType(absentValue, PsiMethodCallExpression.class), presentValue, noneBranch));
         }
       }
@@ -139,11 +143,11 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
             condition.isMap(putCall.getMethodExpression().getQualifierExpression())) {
           PsiExpression[] putArgs = putCall.getArgumentList().getExpressions();
           if (putArgs.length != 2 || !condition.isKey(putArgs[0]) || !ExpressionUtils.isSimpleExpression(putArgs[1])) return;
-          condition.register(holder, new ReplaceWithSingleMapOperation("putIfAbsent", getCall, putArgs[1], result));
+          condition.register(holder, false, new ReplaceWithSingleMapOperation("putIfAbsent", getCall, putArgs[1], result));
         }
         if (mySuggestMapGetOrDefault && condition.isContainsKey() && ExpressionUtils.isSimpleExpression(noneExpression) &&
           condition.isMapValueType(noneExpression.getType())) {
-          condition.register(holder, new ReplaceWithSingleMapOperation("getOrDefault", getCall, noneExpression, result));
+          condition.register(holder, false, new ReplaceWithSingleMapOperation("getOrDefault", getCall, noneExpression, result));
         }
       }
 
@@ -159,7 +163,7 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
           PsiExpression rValue = assignment.getRExpression();
           if (ExpressionUtils.isSimpleExpression(rValue) && condition.isValueReference(assignment.getLExpression()) &&
               !condition.isValueReference(rValue) && condition.isMapValueType(rValue.getType())) {
-            condition.register(holder, ReplaceWithSingleMapOperation.fromIf("getOrDefault", condition, rValue));
+            condition.register(holder, false, ReplaceWithSingleMapOperation.fromIf("getOrDefault", condition, rValue));
           }
         } else if (condition.isGetNull()) {
           /*
@@ -171,25 +175,30 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
            */
           PsiExpression lambdaCandidate = extractLambdaCandidate(condition, noneBranch);
           if (lambdaCandidate != null && mySuggestMapComputeIfAbsent) {
-            condition.register(holder, ReplaceWithSingleMapOperation.fromIf("computeIfAbsent", condition, lambdaCandidate));
+            boolean informationLevel = !mySideEffects && SideEffectChecker.mayHaveSideEffects(lambdaCandidate);
+            condition
+              .register(holder, informationLevel, ReplaceWithSingleMapOperation.fromIf("computeIfAbsent", condition, lambdaCandidate));
           }
           if (lambdaCandidate == null) {
             PsiExpression expression = extractPutValue(condition, noneBranch);
             if(expression != null) {
               String replacement = null;
+              boolean informationLevel = false;
               if (mySuggestMapPutIfAbsent && ExpressionUtils.isSimpleExpression(expression) && !condition.isValueReference(expression)) {
                 replacement = "putIfAbsent";
               }
               else if (mySuggestMapComputeIfAbsent && !condition.hasVariable()) {
+                informationLevel = !mySideEffects && SideEffectChecker.mayHaveSideEffects(expression);
                 replacement = "computeIfAbsent";
               }
               if(replacement != null) {
                 if(condition.hasVariable()) {
-                  condition.register(holder, ReplaceWithSingleMapOperation.fromIf(replacement, condition, expression));
+                  condition.register(holder, informationLevel, ReplaceWithSingleMapOperation.fromIf(replacement, condition, expression));
                 } else {
                   PsiMethodCallExpression call = PsiTreeUtil.getParentOfType(expression, PsiMethodCallExpression.class);
                   LOG.assertTrue(call != null);
-                  condition.register(holder, new ReplaceWithSingleMapOperation(replacement, call, expression, noneBranch));
+                  condition
+                    .register(holder, informationLevel, new ReplaceWithSingleMapOperation(replacement, call, expression, noneBranch));
                 }
               }
             }
@@ -554,9 +563,10 @@ public class Java8MapApiInspection extends BaseJavaBatchLocalInspectionTool {
       return myFullCondition;
     }
 
-    public void register(ProblemsHolder holder, ReplaceWithSingleMapOperation fix) {
+    public void register(ProblemsHolder holder, boolean informationLevel, ReplaceWithSingleMapOperation fix) {
       //noinspection DialogTitleCapitalization
-      holder.registerProblem(getFullCondition(), QuickFixBundle.message("java.8.map.api.inspection.description", fix.myMethodName), fix);
+      holder.registerProblem(getFullCondition(), QuickFixBundle.message("java.8.map.api.inspection.description", fix.myMethodName),
+                             informationLevel ? ProblemHighlightType.INFORMATION : ProblemHighlightType.GENERIC_ERROR_OR_WARNING, fix);
     }
 
     public boolean isMapValueType(@Nullable PsiType type) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RawTypeCanBeGenericInspection.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RawTypeCanBeGenericInspection.java
index cefbd93158c4..b0c7a79c9f6b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RawTypeCanBeGenericInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RawTypeCanBeGenericInspection.java
@@ -120,7 +120,7 @@ public class RawTypeCanBeGenericInspection extends BaseJavaBatchLocalInspectionT
         if (type != null) {
           final TypeMigrationRules rules = new TypeMigrationRules();
           rules.setBoundScope(PsiSearchHelper.SERVICE.getInstance(project).getUseScope(variable));
-          TypeMigrationProcessor.runHighlightingTypeMigration(project, null, rules, variable, type, false);
+          TypeMigrationProcessor.runHighlightingTypeMigration(project, null, rules, variable, type, false, true);
         }
       }
     }
diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
index f84e740e4f43..25f5c0988a3b 100644
--- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
@@ -219,7 +219,6 @@ public class ConvertToInstanceMethodProcessor extends BaseRefactoringProcessor {
   }
 
   protected void performRefactoring(@NotNull UsageInfo[] usages) {
-    if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myTargetClass)) return;
     LocalHistoryAction a = LocalHistory.getInstance().startAction(getCommandName());
     try {
       doRefactoring(usages);
diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java
index a31e18af64fd..8d1b79fb4555 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractEnumProcessor.java
@@ -147,7 +147,8 @@ public class ExtractEnumProcessor {
       myTypeMigrationProcessor = new TypeMigrationProcessor(myProject,
                                                             PsiUtilCore.toPsiElementArray(myEnumConstants),
                                                             Functions.constant(JavaPsiFacade.getElementFactory(myProject).createType(myClass)),
-                                                            rules);
+                                                            rules,
+                                                            true);
       for (UsageInfo usageInfo : myTypeMigrationProcessor.findUsages()) {
         final PsiElement migrateElement = usageInfo.getElement();
         if (migrateElement instanceof PsiField) {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
index e8521d613eac..3c28e2dd11fb 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
@@ -639,6 +639,9 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase {
                                                   final PsiType selectedType,
                                                   final ExtractMethodProcessor processor, 
                                                   final PsiElement[] elements) {
+    if (!elements[0].isValid()) {
+      return;
+    }
     final PsiElement commonParent = findCommonParent(elements);
     if (commonParent == null) {
       LOG.error("Should have common parent:" + Arrays.toString(elements));
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java
index 14271ecfb42c..1ad6657025b8 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java
@@ -42,11 +42,11 @@ import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.refactoring.util.VariableData;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 import java.util.*;
-import java.util.List;
 
 public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler {
 
@@ -68,8 +68,12 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler
         MyExtractMethodProcessor processor =
           new MyExtractMethodProcessor(project, editor, elementsInCopy, null, IntroduceFunctionalVariableAction.REFACTORING_NAME, null,
                                        HelpID.INTRODUCE_VARIABLE);
+        processor.setShowErrorDialogs(false);
         try {
-          processor.prepare();
+          if (!processor.prepare()) {
+            showErrorMessage(project, editor);
+            return;
+          }
         }
         catch (PrepareFailedException e) {
           showErrorMessage(project, editor);
@@ -116,6 +120,7 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler
                                             Editor editor,
                                             MyExtractMethodProcessor processor,
                                             PsiElement[] elements) {
+    if (!elements[0].isValid()) return;
     if (!CommonRefactoringUtil.checkReadOnlyStatus(project, elements[0])) return;
     MyExtractMethodProcessor physicalProcessor =
       new MyExtractMethodProcessor(project, editor, elements, 
@@ -259,6 +264,17 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler
       };
     }
 
+    @Override
+    public boolean prepare(@Nullable Pass<ExtractMethodProcessor> pass) throws PrepareFailedException {
+      final boolean prepare = super.prepare(pass);
+      if (prepare) {
+        if (myNotNullConditionalCheck || myNullConditionalCheck) {
+          return false;
+        }
+      }
+      return prepare;
+    }
+    
     @Override
     public boolean showDialog() {
       if (!myInputVariables.hasInstanceFields() && myInputVariables.getInputVariables().isEmpty() ||
@@ -275,12 +291,11 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler
     }
 
     public void copyParameters(MyExtractMethodProcessor processor) {
-      InputVariables inputVariables = processor.myInputVariables;
-      myInputVariables.setPassFields(inputVariables.isPassFields());
-      List<VariableData> variables = inputVariables.getInputVariables();
-      myVariableDatum = new VariableData[variables.size()];
-      for (int i = 0; i < variables.size(); i++) {
-        VariableData data = variables.get(i);
+      myInputVariables.setPassFields(processor.myInputVariables.isPassFields());
+      VariableData[] variables = processor.myVariableDatum;
+      myVariableDatum = new VariableData[variables.length];
+      for (int i = 0; i < variables.length; i++) {
+        VariableData data = variables[i];
         String variableName = data.variable.getName();
         assert variableName != null;
         VariableData dataByVName =
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
index e4fde5f19f91..e3e18003517c 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
@@ -147,7 +147,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
     try {
       ConflictsUtil.checkMethodConflicts(myTargetClass, myMethod, getPatternMethod(), conflicts);
     }
-    catch (IncorrectOperationException e) {}
+    catch (IncorrectOperationException ignored) {}
 
     return showConflicts(conflicts, usages);
   }
@@ -247,8 +247,6 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
   }
 
   protected void performRefactoring(@NotNull UsageInfo[] usages) {
-    if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myTargetClass)) return;
-
     PsiMethod patternMethod = createMethodToAdd();
     final List<PsiReference> docRefs = new ArrayList<>();
     for (UsageInfo usage : usages) {
@@ -455,16 +453,16 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
     }
     catch (IncorrectOperationException e) {
       LOG.error(e);
+      return null;
     }
-
-    return null;
   }
 
   private PsiMethod createMethodToAdd () {
     ChangeContextUtil.encodeContextInfo(myMethod, true);
     try {
       final PsiManager manager = myMethod.getManager();
-      final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
+      JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject());
+      final PsiElementFactory factory = facade.getElementFactory();
 
       //correct internal references
       final PsiCodeBlock body = myMethod.getBody();
@@ -492,8 +490,11 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
               final PsiElement resolved = expression.resolve();
               if (ExpressionUtils.isReferenceTo(qualifier, myTargetVariable)) {
                 if (resolved instanceof PsiField) {
+                  String fieldName = ((PsiField)resolved).getName();
+                  LOG.assertTrue(fieldName != null);
                   for (PsiParameter parameter : myMethod.getParameterList().getParameters()) {
-                    if (Comparing.strEqual(parameter.getName(), ((PsiField)resolved).getName())) {
+                    if (Comparing.strEqual(parameter.getName(), fieldName) ||
+                        facade.getResolveHelper().resolveReferencedVariable(fieldName, expression) != null) {
                       qualifier.replace(factory.createExpressionFromText("this", null));
                       return;
                     }
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
index 7bbea4a2bca3..d7bccf5807ff 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
@@ -16,9 +16,13 @@
 package com.intellij.refactoring.typeMigration;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.tree.IElementType;
@@ -27,7 +31,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.typeMigration.usageInfo.TypeMigrationUsageInfo;
-import com.intellij.util.Function;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,8 +49,11 @@ public class TypeEvaluator {
   private final HashMap<TypeMigrationUsageInfo, LinkedList<PsiType>> myTypeMap;
   private final TypeMigrationRules myRules;
   private final TypeMigrationLabeler myLabeler;
+  private final ProjectFileIndex myProjectFileIndex;
 
-  public TypeEvaluator(final LinkedList<Pair<TypeMigrationUsageInfo, PsiType>> types, final TypeMigrationLabeler labeler) {
+  public TypeEvaluator(LinkedList<Pair<TypeMigrationUsageInfo, PsiType>> types,
+                       TypeMigrationLabeler labeler,
+                       Project project) {
     myLabeler = labeler;
     myRules = labeler == null ? new TypeMigrationRules() : labeler.getRules();
     myTypeMap = new HashMap<>();
@@ -62,6 +68,7 @@ public class TypeEvaluator {
       }
     }
 
+    myProjectFileIndex =  ProjectRootManager.getInstance(project).getFileIndex();
   }
 
   public boolean setType(final TypeMigrationUsageInfo usageInfo, @NotNull PsiType type) {
@@ -99,6 +106,11 @@ public class TypeEvaluator {
 
   @Nullable
   public PsiType getType(PsiElement element) {
+    VirtualFile file = element.getContainingFile().getVirtualFile();
+    if (file == null || !myProjectFileIndex.isInContent(file)) {
+      return TypeMigrationLabeler.getElementType(element);
+    }
+
     for (Map.Entry<TypeMigrationUsageInfo, LinkedList<PsiType>> entry : myTypeMap.entrySet()) {
       if (Comparing.equal(element, entry.getKey().getElement())) {
         return entry.getValue().getFirst();
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index 99f08d727966..3cfb1c5412b7 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -67,6 +67,7 @@ public class TypeMigrationLabeler {
   private boolean myShowWarning = true;
   private volatile MigrateException myException;
   private final Semaphore myDialogSemaphore = new Semaphore();
+  private final Project myProject;
 
   public TypeMigrationRules getRules() {
     return myRules;
@@ -74,6 +75,7 @@ public class TypeMigrationLabeler {
 
   private final TypeMigrationRules myRules;
   private final Function<PsiElement, PsiType> myMigrationRootTypeFunction;
+  @Nullable private final Set<PsiElement> myAllowedRoots;
   private TypeEvaluator myTypeEvaluator;
   private final LinkedHashMap<PsiElement, Object> myConversions;
   private final Map<Pair<SmartPsiElementPointer<PsiExpression>, PsiType>, TypeMigrationUsageInfo> myFailedConversions;
@@ -89,18 +91,23 @@ public class TypeMigrationLabeler {
   private final Map<Pair<TypeMigrationUsageInfo, TypeMigrationUsageInfo>, Set<PsiElement>> myRootUsagesTree = new HashMap<>();
   private final Set<TypeMigrationUsageInfo> myProcessedRoots = new HashSet<>();
 
-  public TypeMigrationLabeler(final TypeMigrationRules rules, PsiType rootType) {
-    this(rules, Functions.constant(rootType));
+  public TypeMigrationLabeler(TypeMigrationRules rules, PsiType rootType, Project project) {
+    this(rules, Functions.constant(rootType), null, project);
   }
 
-  public TypeMigrationLabeler(final TypeMigrationRules rules, Function<PsiElement, PsiType> migrationRootTypeFunction) {
+  public TypeMigrationLabeler(TypeMigrationRules rules,
+                              Function<PsiElement, PsiType> migrationRootTypeFunction,
+                              @Nullable("any root accepted if null") PsiElement[] allowedRoots,
+                              Project project) {
     myRules = rules;
     myMigrationRootTypeFunction = migrationRootTypeFunction;
+    myAllowedRoots = allowedRoots == null ? null : ContainerUtil.set(allowedRoots);
 
     myConversions = new LinkedHashMap<>();
     myFailedConversions = new LinkedHashMap<>();
     myNewExpressionTypeChange = new LinkedHashMap<>();
     myClassTypeArgumentsChange = new LinkedHashMap<>();
+    myProject = project;
   }
 
   public boolean hasFailedConversions() {
@@ -574,6 +581,9 @@ public class TypeMigrationLabeler {
                            boolean alreadyProcessed,
                            final boolean isContraVariantPosition,
                            final boolean userDefinedType) {
+    if (myAllowedRoots != null && !myAllowedRoots.contains(element)) {
+      return false;
+    }
     if (type.equals(PsiType.NULL)) {
       return false;
     }
@@ -1061,7 +1071,7 @@ public class TypeMigrationLabeler {
   private void migrate(boolean autoMigrate, final PsiElement... victims) {
 
     myMigrationRoots = new LinkedList<>();
-    myTypeEvaluator = new TypeEvaluator(myMigrationRoots, this);
+    myTypeEvaluator = new TypeEvaluator(myMigrationRoots, this, myProject);
 
 
     for (PsiElement victim : victims) {
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java
index c48fb4c9558b..8021fdd4b50b 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java
@@ -50,18 +50,25 @@ import java.util.Set;
 import static com.intellij.util.ObjectUtils.assertNotNull;
 
 public class TypeMigrationProcessor extends BaseRefactoringProcessor {
+  public volatile static boolean ourSkipFailedConversionInTestMode;
   private final static int MAX_ROOT_IN_PREVIEW_PRESENTATION = 3;
 
-  private PsiElement[] myRoot;
+  private PsiElement[] myRoots;
   private final Function<PsiElement, PsiType> myRootTypes;
+  private final boolean myAllowDependentRoots;
   private final TypeMigrationRules myRules;
   private TypeMigrationLabeler myLabeler;
 
-  public TypeMigrationProcessor(final Project project, final PsiElement[] roots, final Function<PsiElement, PsiType> rootTypes, final TypeMigrationRules rules) {
+  public TypeMigrationProcessor(final Project project,
+                                final PsiElement[] roots,
+                                final Function<PsiElement, PsiType> rootTypes,
+                                final TypeMigrationRules rules,
+                                final boolean allowDependentRoots) {
     super(project);
-    myRoot = roots;
+    myRoots = roots;
     myRules = rules;
     myRootTypes = rootTypes;
+    myAllowDependentRoots = allowDependentRoots;
   }
 
   public static void runHighlightingTypeMigration(final Project project,
@@ -69,7 +76,7 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
                                                   final TypeMigrationRules rules,
                                                   final PsiElement root,
                                                   final PsiType migrationType) {
-    runHighlightingTypeMigration(project, editor, rules, root, migrationType, false);
+    runHighlightingTypeMigration(project, editor, rules, root, migrationType, false, true);
   }
 
   public static void runHighlightingTypeMigration(final Project project,
@@ -77,8 +84,9 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
                                                   final TypeMigrationRules rules,
                                                   final PsiElement root,
                                                   final PsiType migrationType,
-                                                  final boolean optimizeImports) {
-    runHighlightingTypeMigration(project, editor, rules, new PsiElement[] {root}, Functions.constant(migrationType), optimizeImports);
+                                                  final boolean optimizeImports,
+                                                  boolean allowDependentRoots) {
+    runHighlightingTypeMigration(project, editor, rules, new PsiElement[] {root}, Functions.constant(migrationType), optimizeImports, allowDependentRoots);
   }
 
 
@@ -87,9 +95,10 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
                                                   final TypeMigrationRules rules,
                                                   final PsiElement[] roots,
                                                   final Function<PsiElement, PsiType> migrationTypeFunction,
-                                                  final boolean optimizeImports) {
-    final Set<PsiFile> containingFiles = ContainerUtil.map2Set(roots, element -> element.getContainingFile());
-    final TypeMigrationProcessor processor = new TypeMigrationProcessor(project, roots, migrationTypeFunction, rules) {
+                                                  final boolean optimizeImports,
+                                                  boolean allowDependentRoots) {
+    final Set<PsiFile> containingFiles = ContainerUtil.map2Set(roots, PsiElement::getContainingFile);
+    final TypeMigrationProcessor processor = new TypeMigrationProcessor(project, roots, migrationTypeFunction, rules, allowDependentRoots) {
       @Override
       public void performRefactoring(@NotNull final UsageInfo[] usages) {
         super.performRefactoring(usages);
@@ -135,13 +144,17 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
   @NotNull
   @Override
   protected UsageViewDescriptor createUsageViewDescriptor(@NotNull UsageInfo[] usages) {
-    return new TypeMigrationViewDescriptor(myRoot[0]);
+    return new TypeMigrationViewDescriptor(myRoots[0]);
   }
 
   @Override
   protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
     if (hasFailedConversions()) {
       if (ApplicationManager.getApplication().isUnitTestMode()) {
+        if (ourSkipFailedConversionInTestMode) {
+          prepareSuccessful();
+          return true;
+        }
         throw new BaseRefactoringProcessor.ConflictsInTestsException(Arrays.asList(myLabeler.getFailedConversionsReport()));
       }
       FailedConversionsDialog dialog = new FailedConversionsDialog(myLabeler.getFailedConversionsReport(), myProject);
@@ -164,24 +177,24 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
 
   @Override
   protected void previewRefactoring(@NotNull final UsageInfo[] usages) {
-    MigrationPanel panel = new MigrationPanel(myRoot, myLabeler, myProject, isPreviewUsages());
+    MigrationPanel panel = new MigrationPanel(myRoots, myLabeler, myProject, isPreviewUsages());
     String name;
-    if (myRoot.length == 1) {
-      String fromType = assertNotNull(TypeMigrationLabeler.getElementType(myRoot[0])).getPresentableText();
-      String toType = myRootTypes.fun(myRoot[0]).getPresentableText();
+    if (myRoots.length == 1) {
+      String fromType = assertNotNull(TypeMigrationLabeler.getElementType(myRoots[0])).getPresentableText();
+      String toType = myRootTypes.fun(myRoots[0]).getPresentableText();
       String text;
-      text = getPresentation(myRoot[0]);
+      text = getPresentation(myRoots[0]);
       name = "Migrate Type of " + text + " from \'" + fromType + "\' to \'" + toType + "\'";
     } else {
-      final int rootsInPresentationCount = myRoot.length > MAX_ROOT_IN_PREVIEW_PRESENTATION ? MAX_ROOT_IN_PREVIEW_PRESENTATION : myRoot.length;
+      final int rootsInPresentationCount = myRoots.length > MAX_ROOT_IN_PREVIEW_PRESENTATION ? MAX_ROOT_IN_PREVIEW_PRESENTATION : myRoots.length;
       String[] rootsPresentation = new String[rootsInPresentationCount];
       for (int i = 0; i < rootsInPresentationCount; i++) {
-        final PsiElement root = myRoot[i];
+        final PsiElement root = myRoots[i];
         rootsPresentation[i] = root instanceof PsiNamedElement ? ((PsiNamedElement)root).getName() : root.getText();
       }
       rootsPresentation = StringUtil.surround(rootsPresentation, "\'", "\'");
       name = "Migrate Type of " + StringUtil.join(rootsPresentation, ", ");
-      if (myRoot.length > MAX_ROOT_IN_PREVIEW_PRESENTATION) {
+      if (myRoots.length > MAX_ROOT_IN_PREVIEW_PRESENTATION) {
         name += "...";
       }
     }
@@ -213,21 +226,21 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
   @NotNull
   @Override
   public UsageInfo[] findUsages() {
-    myLabeler = new TypeMigrationLabeler(myRules, myRootTypes);
+    myLabeler = new TypeMigrationLabeler(myRules, myRootTypes, myAllowDependentRoots ? null : myRoots, myProject);
 
     try {
-      return myLabeler.getMigratedUsages(!isPreviewUsages(), myRoot);
+      return myLabeler.getMigratedUsages(!isPreviewUsages(), myRoots);
     }
     catch (TypeMigrationLabeler.MigrateException e) {
       setPreviewUsages(true);
       myLabeler.clearStopException();
-      return myLabeler.getMigratedUsages(false, myRoot);
+      return myLabeler.getMigratedUsages(false, myRoots);
     }
   }
 
   @Override
   protected void refreshElements(@NotNull PsiElement[] elements) {
-    myRoot = elements;
+    myRoots = elements;
   }
 
   @Override
@@ -287,6 +300,7 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
     return myLabeler;
   }
 
+  @NotNull
   @Override
   protected String getCommandName() {
     return "TypeMigration";
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java
index 51ad967a91da..7a23e5cb45a2 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java
@@ -386,6 +386,8 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor {
       final PsiExpression rOperand = operands[i];
       if (rOperand == null) return;
       final TypeView right = new TypeView(rOperand);
+      if (tryFindConversionIfOperandIsNull(left, right, rOperand)) continue;
+      if (tryFindConversionIfOperandIsNull(right, left, lOperand)) continue;
       if (!TypeConversionUtil.isBinaryOperatorApplicable(operationTokenType, left.getType(), right.getType(), false)) {
         if (left.isChanged()) {
           findConversionOrFail(lOperand, lOperand, left.getTypePair());
@@ -399,6 +401,19 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor {
     }
   }
 
+  protected boolean tryFindConversionIfOperandIsNull(TypeView nullCandidate, TypeView comparingType, PsiExpression comparingExpr) {
+    if (nullCandidate.getType() == PsiType.NULL && comparingType.isChanged()) {
+      Pair<PsiType, PsiType> typePair = comparingType.getTypePair();
+      final TypeConversionDescriptorBase
+        conversion = myLabeler.getRules().findConversion(typePair.getFirst(), typePair.getSecond(), null, comparingExpr, false, myLabeler);
+      if (conversion != null) {
+        myLabeler.setConversionMapping(comparingExpr, conversion);
+      }
+      return true;
+    }
+    return false;
+  }
+
   private void processArrayInitializer(final PsiArrayInitializerExpression expression, final PsiExpression parentExpression) {
     final PsiExpression[] initializers = expression.getInitializers();
     PsiType migrationType = null;
@@ -593,6 +608,7 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor {
     }
   }
 
+
   private static boolean canBeVariableType(@NotNull PsiType type) {
     return !type.getDeepComponentType().equals(PsiType.VOID);
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
index 7451fd065d6f..bea30d1fabbd 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
@@ -98,7 +98,7 @@ public abstract class TypeMigrationDialog extends RefactoringDialog {
       myRules = new TypeMigrationRules();
       myRules.setBoundScope(myScopeChooserCombo.getSelectedScope());
     }
-    invokeRefactoring(new TypeMigrationProcessor(myProject, myRoots, getMigrationTypeFunction(), myRules));
+    invokeRefactoring(new TypeMigrationProcessor(myProject, myRoots, getMigrationTypeFunction(), myRules, true));
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/unscramble/ThreadDumpParser.java b/java/java-impl/src/com/intellij/unscramble/ThreadDumpParser.java
index efd09fc7b1ea..30a818b5efbf 100644
--- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpParser.java
+++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpParser.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 public class ThreadDumpParser {
   private static final Pattern ourThreadStartPattern = Pattern.compile("^\\s*\"(.+)\".+(prio=\\d+ (?:os_prio=[^\\s]+ )?tid=[^\\s]+ nid=[^\\s]+|[Ii][Dd]=\\d+) ([^\\[]+)");
   private static final Pattern ourYourkitThreadStartPattern = Pattern.compile("(.+) \\[([^\\[]*)]");
+  private static final Pattern ourYourkitThreadStartPattern2 = Pattern.compile("(.+) State: (.+) CPU usage on sample: .+");
   private static final Pattern ourThreadStatePattern = Pattern.compile("java\\.lang\\.Thread\\.State: (.+) \\((.+)\\)");
   private static final Pattern ourThreadStatePattern2 = Pattern.compile("java\\.lang\\.Thread\\.State: (.+)");
   private static final Pattern ourWaitingForLockPattern = Pattern.compile("- waiting (on|to lock) <(.+)>");
@@ -188,7 +189,7 @@ public class ThreadDumpParser {
   }
 
   @Nullable
-  private static ThreadState tryParseThreadStart(final String line) {
+  private static ThreadState tryParseThreadStart(String line) {
     Matcher m = ourThreadStartPattern.matcher(line);
     if (m.find()) {
       final ThreadState state = new ThreadState(m.group(1), m.group(3));
@@ -197,14 +198,17 @@ public class ThreadDumpParser {
       }
       return state;
     }
+    
+    boolean daemon = line.contains(" [DAEMON]");
+    if (daemon) {
+      line = StringUtil.replace(line, " [DAEMON]", "");
+    }
 
-    String noDaemon = StringUtil.trimEnd(line, " [DAEMON]");
-    m = ourYourkitThreadStartPattern.matcher(noDaemon);
+    m = ourYourkitThreadStartPattern.matcher(line);
+    if (!m.matches()) m = ourYourkitThreadStartPattern2.matcher(line);
     if (m.matches()) {
       ThreadState state = new ThreadState(m.group(1), m.group(2));
-      if (noDaemon.length() < line.length()) {
-        state.setDaemon(true);
-      }
+      state.setDaemon(daemon);
       return state;
     }
     return null;
diff --git a/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndNotOnlyArrayWithObjectsTemplate.java b/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndNotOnlyArrayWithObjectsTemplate.java
new file mode 100644
index 000000000000..954da76acb42
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndNotOnlyArrayWithObjectsTemplate.java
@@ -0,0 +1,29 @@
+import java.util.Arrays;
+import java.util.Objects;
+
+class A {
+  int i;
+  String s;
+  int[] a1;
+  int[] a2;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final A a = (A) o;
+        return i == a.i &&
+                Objects.equals(s, a.s) &&
+                Arrays.equals(a1, a.a1) &&
+                Arrays.equals(a2, a.a2);
+    }
+
+    @Override
+    public int hashCode() {
+
+        int result = Objects.hash(i, s);
+        result = 31 * result + Arrays.hashCode(a1);
+        result = 31 * result + Arrays.hashCode(a2);
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndSuperWithObjectsTemplate.java b/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndSuperWithObjectsTemplate.java
new file mode 100644
index 000000000000..6e18524921f2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/generateEquals/afterArrayAndSuperWithObjectsTemplate.java
@@ -0,0 +1,31 @@
+import java.util.Arrays;
+
+class I {
+  public int hashCode() {
+    return 0;
+  }
+  public boolean equals(Object o) {
+    return o == this;
+  }
+}
+class A extends I {
+  int[] a1;
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        final A a = (A) o;
+        return Arrays.equals(a1, a.a1);
+    }
+
+    @Override
+    public int hashCode() {
+
+        int result = super.hashCode();
+        result = 31 * result + Arrays.hashCode(a1);
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndNotOnlyArrayWithObjectsTemplate.java b/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndNotOnlyArrayWithObjectsTemplate.java
new file mode 100644
index 000000000000..edb9e70caf7c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndNotOnlyArrayWithObjectsTemplate.java
@@ -0,0 +1,7 @@
+class A {
+  int i;
+  String s;
+  int[] a1;
+  int[] a2;
+  <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndSuperWithObjectsTemplate.java b/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndSuperWithObjectsTemplate.java
new file mode 100644
index 000000000000..1347fd7d2bf6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/generateEquals/beforeArrayAndSuperWithObjectsTemplate.java
@@ -0,0 +1,13 @@
+class I {
+  public int hashCode() {
+    return 0;
+  }
+  public boolean equals(Object o) {
+    return o == this;
+  }
+}
+class A extends I {
+  int[] a1;
+  
+  <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/Junit5Assert.java b/java/java-tests/testData/inspection/dataFlow/fixture/Junit5Assert.java
index 9a0c5684f31f..bc7ca9fbd981 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/Junit5Assert.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/Junit5Assert.java
@@ -8,4 +8,20 @@ class Contracts {
     String s = o.toString();
   }
 
+  void foo2(@Nullable Object o) {
+    Assertions.assertNotNull(o, "message");
+    String s = o.toString();
+  }
+
+  void foo3(java.util.function.BooleanSupplier o) {
+    Assertions.assertTrue(o, "message");
+  }
+
+  void foo3(boolean b) {
+    Assertions.assertTrue(b, "message");
+    if (<warning descr="Condition '!b' is always 'false'">!<warning descr="Value 'b' is always 'true'">b</warning></warning>) {
+      System.out.println("how?");
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentSingleLine.java b/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentSingleLine.java
index a6caf3d589d9..9b3c5bcfacf2 100644
--- a/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentSingleLine.java
+++ b/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentSingleLine.java
@@ -1,4 +1,4 @@
-// "Replace with 'computeIfAbsent' method call" "true"
+// "Replace with 'computeIfAbsent' method call" "GENERIC_ERROR_OR_WARNING"
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentUsedKey.java b/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentUsedKey.java
index 7167e9f3f07f..a35a993fe20f 100644
--- a/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentUsedKey.java
+++ b/java/java-tests/testData/inspection/java8MapApi/afterComputeIfAbsentUsedKey.java
@@ -1,4 +1,4 @@
-// "Replace with 'computeIfAbsent' method call" "true"
+// "Replace with 'computeIfAbsent' method call" "INFORMATION"
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/java/java-tests/testData/inspection/java8MapApi/afterMergeSimple.java b/java/java-tests/testData/inspection/java8MapApi/afterMergeSimple.java
index 38fddca37cbd..06b240d35435 100644
--- a/java/java-tests/testData/inspection/java8MapApi/afterMergeSimple.java
+++ b/java/java-tests/testData/inspection/java8MapApi/afterMergeSimple.java
@@ -1,4 +1,4 @@
-// "Replace with 'merge' method call" "true"
+// "Replace with 'merge' method call" "GENERIC_ERROR_OR_WARNING"
 import java.util.Map;
 
 public class Main {
diff --git a/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentSingleLine.java b/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentSingleLine.java
index 96071e187676..0c97d5f5694a 100644
--- a/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentSingleLine.java
+++ b/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentSingleLine.java
@@ -1,4 +1,4 @@
-// "Replace with 'computeIfAbsent' method call" "true"
+// "Replace with 'computeIfAbsent' method call" "GENERIC_ERROR_OR_WARNING"
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentUsedKey.java b/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentUsedKey.java
index 3b0c3f0b3025..4ed73df5ef2d 100644
--- a/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentUsedKey.java
+++ b/java/java-tests/testData/inspection/java8MapApi/beforeComputeIfAbsentUsedKey.java
@@ -1,4 +1,4 @@
-// "Replace with 'computeIfAbsent' method call" "true"
+// "Replace with 'computeIfAbsent' method call" "INFORMATION"
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/java/java-tests/testData/inspection/java8MapApi/beforeMergeSimple.java b/java/java-tests/testData/inspection/java8MapApi/beforeMergeSimple.java
index e4933d8bb334..4c121c191bcc 100644
--- a/java/java-tests/testData/inspection/java8MapApi/beforeMergeSimple.java
+++ b/java/java-tests/testData/inspection/java8MapApi/beforeMergeSimple.java
@@ -1,4 +1,4 @@
-// "Replace with 'merge' method call" "true"
+// "Replace with 'merge' method call" "GENERIC_ERROR_OR_WARNING"
 import java.util.Map;
 
 public class Main {
diff --git a/java/java-tests/testData/refactoring/introduceFunctionalVariable/beforeIgnoreMethodObjectSuggestion.java b/java/java-tests/testData/refactoring/introduceFunctionalVariable/beforeIgnoreMethodObjectSuggestion.java
new file mode 100644
index 000000000000..bdcca53bc9a4
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceFunctionalVariable/beforeIgnoreMethodObjectSuggestion.java
@@ -0,0 +1,8 @@
+class Test {
+    {
+        int x = 0, y;
+        <selection>y = ++x;</selection>
+        System.out.println("x = " + x);
+        System.out.println("y = " + y);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java b/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java
new file mode 100644
index 000000000000..95fb0af394af
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java
@@ -0,0 +1,23 @@
+
+import java.util.ArrayList;
+import java.util.List;
+
+class Data {
+    final List<Datum> datums;
+
+    Data(List<Datum> datums) {
+        this.datums = datums;
+    }
+
+    static class Datum { }
+}
+
+class DataUser {
+    public List<Data.Datum> fi<caret>lter(Data data) {
+        List<Data.Datum> datums = new ArrayList<>();
+        for (Data.Datum datum : data.datums) {
+            if (datum != null) datums.add(datum);
+        }
+        return datums;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java.after
new file mode 100644
index 000000000000..98e743c91614
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/ConflictingLocalVariableAndTargetClassField.java.after
@@ -0,0 +1,24 @@
+
+import java.util.ArrayList;
+import java.util.List;
+
+class Data {
+    final List<Datum> datums;
+
+    Data(List<Datum> datums) {
+        this.datums = datums;
+    }
+
+    public List<Datum> filter() {
+        List<Datum> datums = new ArrayList<>();
+        for (Datum datum : this.datums) {
+            if (datum != null) datums.add(datum);
+        }
+        return datums;
+    }
+
+    static class Datum { }
+}
+
+class DataUser {
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateEquals15Test.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateEquals15Test.java
index fca0f68f7add..6e0ea58cb7fd 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateEquals15Test.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateEquals15Test.java
@@ -68,6 +68,14 @@ public class GenerateEquals15Test extends GenerateEqualsTestCase {
     doTestWithTemplate(EqualsHashCodeTemplatesManager.JAVA_UTIL_OBJECTS_EQUALS_AND_HASH_CODE);
   }
 
+  public void testArrayAndNotOnlyArrayWithObjectsTemplate() throws Exception {
+    doTestWithTemplate(EqualsHashCodeTemplatesManager.JAVA_UTIL_OBJECTS_EQUALS_AND_HASH_CODE);
+  }
+
+  public void testArrayAndSuperWithObjectsTemplate() throws Exception {
+    doTestWithTemplate(EqualsHashCodeTemplatesManager.JAVA_UTIL_OBJECTS_EQUALS_AND_HASH_CODE);
+  }
+
   private void doTestWithTemplate(String templateName) throws Exception {
     try {
       EqualsHashCodeTemplatesManager.getInstance().setDefaultTemplate(templateName);
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/HighlightStressTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/HighlightStressTest.java
index 612b536bfe1f..e5dd976d8678 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/HighlightStressTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/HighlightStressTest.java
@@ -107,7 +107,7 @@ public class HighlightStressTest extends LightDaemonAnalyzerTestCase {
       UIUtil.dispatchAllInvocationEvents();
       FileEditorManagerEx.getInstanceEx(getProject()).closeAllFiles();
     }
-    System.out.println(System.currentTimeMillis() - time+"ms");
+    LOG.debug(System.currentTimeMillis() - time+"ms");
   }
 
   public void _testHugeFile() throws Exception {
@@ -124,11 +124,11 @@ public class HighlightStressTest extends LightDaemonAnalyzerTestCase {
       doHighlighting();
       long end = System.currentTimeMillis();
       time[i] = end - start;
-      System.out.println("i = " + i + "; time= "+(end-start));
+      LOG.debug("i = " + i + "; time= "+(end-start));
 
       UIUtil.dispatchAllInvocationEvents();
     }
-    System.out.println("Average among the N/3 median times: " + ArrayUtil.averageAmongMedians(time, 3) + "ms");
+    LOG.debug("Average among the N/3 median times: " + ArrayUtil.averageAmongMedians(time, 3) + "ms");
 
     //System.out.println("JobLauncher.COUNT   = " + JobLauncher.COUNT);
     //System.out.println("JobLauncher.TINY    = " + JobLauncher.TINY_COUNT);
@@ -166,7 +166,7 @@ public class HighlightStressTest extends LightDaemonAnalyzerTestCase {
       PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
       long start = System.currentTimeMillis();
 
-      System.out.println("i = " + i);
+      LOG.debug("i = " + i);
       String s = myFile.getText();
       int offset;
       while (true) {
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
index 060891f0bef0..405012b73a74 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
@@ -27,6 +27,7 @@ import com.intellij.codeInsight.folding.JavaCodeFoldingSettings;
 import com.intellij.codeInsight.hint.EditorHintListener;
 import com.intellij.codeInsight.intention.AbstractIntentionAction;
 import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.codeInsight.intention.IntentionActionDelegate;
 import com.intellij.codeInsight.intention.IntentionManager;
 import com.intellij.codeInsight.intention.impl.IntentionHintComponent;
 import com.intellij.codeInspection.*;
@@ -36,6 +37,7 @@ import com.intellij.codeInspection.deadCode.UnusedDeclarationInspectionBase;
 import com.intellij.codeInspection.ex.InspectionToolRegistrar;
 import com.intellij.codeInspection.ex.InspectionToolWrapper;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
+import com.intellij.codeInspection.ex.QuickFixWrapper;
 import com.intellij.codeInspection.htmlInspections.RequiredAttributesInspectionBase;
 import com.intellij.codeInspection.varScopeCanBeNarrowed.FieldCanBeLocalInspection;
 import com.intellij.configurationStore.StorageUtilKt;
@@ -1576,7 +1578,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
 
     final DaemonCodeAnalyzerImpl codeAnalyzer = (DaemonCodeAnalyzerImpl)DaemonCodeAnalyzer.getInstance(getProject());
     int N = Math.max(5, Timings.adjustAccordingToMySpeed(80, false));
-    System.out.println("N = " + N);
+    LOG.debug("N = " + N);
     final long[] interruptTimes = new long[N];
     for (int i = 0; i < N; i++) {
       codeAnalyzer.restart();
@@ -1688,7 +1690,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
 
     final DaemonCodeAnalyzerImpl codeAnalyzer = (DaemonCodeAnalyzerImpl)DaemonCodeAnalyzer.getInstance(getProject());
     int N = Math.max(5, Timings.adjustAccordingToMySpeed(80, false));
-    System.out.println("N = " + N);
+    LOG.debug("N = " + N);
     final long[] interruptTimes = new long[N];
     for (int i = 0; i < N; i++) {
       codeAnalyzer.restart();
@@ -2651,7 +2653,32 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
     assertEmpty(fixes);
   }
 
+  public void testStupidQuickFixIsStillVisibleAfterAppliedButDidNothing() {
+    MyInspection tool = new MyInspection();
+    enableInspectionTool(tool);
+    disposeOnTearDown(() -> disableInspectionTool(tool.getShortName()));
+
+    @Language("JAVA")
+    String text = "class X { void f() { if (this == null) {} else return; } }";
+    configureByText(JavaFileType.INSTANCE, text);
+    WriteCommandAction.runWriteCommandAction(getProject(), () -> myEditor.getDocument().setText(text));
+    getEditor().getCaretModel().moveToOffset(getFile().getText().indexOf("if (") + 1);
+    assertEmpty(doHighlighting(HighlightSeverity.ERROR));
+    List<IntentionAction> fixes = findStupidFixes();
+    IntentionAction fix = assertOneElement(fixes);
+    ((MyInspection.StupidQuickFixWhichDoesntCheckItsOwnApplicability)((QuickFixWrapper)((IntentionActionDelegate)fix).getDelegate()).getFix()).doFix = false;
+    fix.invoke(getProject(), getEditor(), getFile()); // did nothing
+
+    fixes = findStupidFixes();
+    assertOneElement(fixes);
+
+    assertEmpty(doHighlighting(HighlightSeverity.ERROR));
+    fixes = findStupidFixes();
+    assertOneElement(fixes);
+  }
+
   private List<IntentionAction> findStupidFixes() {
+    UIUtil.dispatchAllInvocationEvents();
     return CodeInsightTestFixtureImpl.getAvailableIntentions(getEditor(), getFile())
       .stream().filter(f->f.getFamilyName().equals(new MyInspection.StupidQuickFixWhichDoesntCheckItsOwnApplicability().getFamilyName()))
       .collect(Collectors.toList());
@@ -2692,6 +2719,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
       };
     }
     private static class StupidQuickFixWhichDoesntCheckItsOwnApplicability implements LocalQuickFix {
+      private boolean doFix = true;
       @Nls
       @NotNull
       @Override
@@ -2708,7 +2736,9 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
 
       @Override
       public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-        WriteCommandAction.runWriteCommandAction(project, () -> ((PsiIfStatement)descriptor.getPsiElement().getParent()).getElseBranch().delete());
+        if (doFix) {
+          WriteCommandAction.runWriteCommandAction(project, () -> ((PsiIfStatement)descriptor.getPsiElement().getParent()).getElseBranch().delete());
+        }
       }
     }
   }
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ComparatorResultComparisonInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ComparatorResultComparisonInspectionTest.java
index 4f756a2fdfc5..49ba51e19c23 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ComparatorResultComparisonInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ComparatorResultComparisonInspectionTest.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 
 
 public class ComparatorResultComparisonInspectionTest extends LightInspectionTestCase {
-  public static final String TEST_DATA_DIR = "/codeInsight/daemonCodeAnalyzer/quickFix/comparatorResultComparison/";
+  static final String TEST_DATA_DIR = "/codeInsight/daemonCodeAnalyzer/quickFix/comparatorResultComparison/";
 
   public void testComparatorResultComparison() {
     doTest();
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/HardcodedContractsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/HardcodedContractsTest.java
index b0add7d87154..15018ea6e785 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/HardcodedContractsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/HardcodedContractsTest.java
@@ -17,11 +17,18 @@ package com.intellij.java.codeInspection;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.dataFlow.DataFlowInspection;
+import com.intellij.testFramework.LightProjectDescriptor;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author peter
  */
 public class HardcodedContractsTest extends DataFlowInspectionTestCase {
+  @NotNull
+  @Override
+  protected LightProjectDescriptor getProjectDescriptor() {
+    return JAVA_8;
+  }
 
   @Override
   protected String getTestDataPath() {
@@ -110,8 +117,13 @@ public class HardcodedContractsTest extends DataFlowInspectionTestCase {
   }
 
   public void testJunit5Assert() {
-    myFixture.addClass("package org.junit.jupiter.api; public class Assertions {\n" +
+    myFixture.addClass("package org.junit.jupiter.api;" +
+                       "import java.util.function.BooleanSupplier;" +
+                       "public class Assertions {\n" +
                        "    public static void assertNotNull(Object actual){}" +
+                       "    public static void assertNotNull(Object actual, String message){}" +
+                       "    public static void assertTrue(boolean b, String message){}" +
+                       "    public static void assertTrue(BooleanSupplier b, String message){}" +
                        "}");
     checkHighlighting();
   }
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/ObviousNullCheckInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/ObviousNullCheckInspectionTest.java
index 92a022b0a9d8..0d64070eac3f 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/ObviousNullCheckInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/ObviousNullCheckInspectionTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Tagir Valeev
  */
 public class ObviousNullCheckInspectionTest extends LightInspectionTestCase {
-  public static final String TEST_DATA_DIR = "/inspection/obviousNotNull/";
+  static final String TEST_DATA_DIR = "/inspection/obviousNotNull/";
 
   private static final LightProjectDescriptor JAVA_8_WITH_ANNOTATIONS = new DefaultLightProjectDescriptor() {
     @Override
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/FunctionalInterfaceSuggesterTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/FunctionalInterfaceSuggesterTest.java
index ac29ef6cd9db..7933870d62e2 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/FunctionalInterfaceSuggesterTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/FunctionalInterfaceSuggesterTest.java
@@ -39,8 +39,8 @@ public class FunctionalInterfaceSuggesterTest extends LightCodeInsightFixtureTes
       .stream()
       .map(type -> type.getCanonicalText())
       .collect(Collectors.toList());
-    Assert.assertTrue(suggestedTypes.containsAll(Arrays.asList("java.util.function.IntToDoubleFunction", 
+    Assert.assertEquals(4, suggestedTypes.size());
+    Assert.assertTrue(suggestedTypes.containsAll(Arrays.asList("java.util.function.ToDoubleFunction<java.lang.Double>",
                                                                "java.util.function.DoubleUnaryOperator")));
-    Assert.assertFalse(suggestedTypes.contains("java.util.function.LongToIntFunction"));
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFunctionalVariableTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFunctionalVariableTest.java
index a608f3868816..347cab7442ff 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFunctionalVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFunctionalVariableTest.java
@@ -63,6 +63,17 @@ public class IntroduceFunctionalVariableTest extends LightRefactoringTestCase  {
     doTest(0);
   }
 
+  public void testIgnoreMethodObjectSuggestion() throws Exception {
+    try {
+      doTest();
+      fail("Unable to perform is expected");
+    }
+    catch (CommonRefactoringUtil.RefactoringErrorHintException e) {
+      assertEquals("Cannot perform refactoring.\n" +
+                   "Extract Functional Variable is not supported in current context", e.getMessage());
+    }
+  }
+
   public void testNoSuggestionForInaccessibleInterface() throws Exception {
     try {
       doTest();
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineToAnonymousClassTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineToAnonymousClassTest.java
index 5fdab5452694..118c3b0e70b4 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineToAnonymousClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineToAnonymousClassTest.java
@@ -502,10 +502,7 @@ public class InlineToAnonymousClassTest extends LightRefactoringTestCase {
   }
 
   @Override
-  protected LanguageLevel getLanguageLevel() {
-    if (getTestName(false).endsWith("Java8")) {
-      return LanguageLevel.JDK_1_8;
-    }
+  protected LanguageLevel getDefaultLanguageLevel() {
     return LanguageLevel.JDK_1_7;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/moveMethod/MoveInstanceMethodTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/moveMethod/MoveInstanceMethodTest.java
index 3d8afa6f693a..fe38c011a998 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/moveMethod/MoveInstanceMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/moveMethod/MoveInstanceMethodTest.java
@@ -104,6 +104,10 @@ public class MoveInstanceMethodTest extends LightRefactoringTestCase {
     doTest(true, 0);
   }
 
+  public void testConflictingLocalVariableAndTargetClassField() throws Exception {
+    doTest(true, 0);
+  }
+
   public void testMethodReference() throws Exception {
     BaseRefactoringProcessor.ConflictsInTestsException.withIgnoredConflicts(() -> doTest(true, 0));
   }
diff --git a/java/java-tests/testSrc/com/intellij/unscramble/ThreadDumpParserTest.groovy b/java/java-tests/testSrc/com/intellij/unscramble/ThreadDumpParserTest.groovy
index 1048ec4bccac..7f63ba4a86df 100644
--- a/java/java-tests/testSrc/com/intellij/unscramble/ThreadDumpParserTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/unscramble/ThreadDumpParserTest.groovy
@@ -118,6 +118,56 @@ java.lang.Thread.run() Thread.java:745
     assert threads.collect { it.daemon } == [false, true, false]
     assert threads.collect { it.stackTrace.readLines().size() } == [2, 2, 5] // thread name is included into stack trace
   }
+  
+  void "test YourKit 2017 format"() {
+    def text = '''
+Stacks at 2017-06-08 12:56:31 PM. Uptime is 23m 47s 200ms.
+
+thread 23 State: RUNNABLE CPU usage on sample: 968ms
+com.intellij.openapi.util.io.win32.IdeaWin32.listChildren0(String) IdeaWin32.java (native)
+com.intellij.openapi.util.io.win32.IdeaWin32.listChildren(String) IdeaWin32.java:136
+com.intellij.openapi.vfs.impl.win32.Win32FsCache.list(VirtualFile) Win32FsCache.java:58
+com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem.list(VirtualFile) Win32LocalFileSystem.java:57
+com.intellij.openapi.vfs.newvfs.persistent.RefreshWorker.partialDirRefresh(NewVirtualFileSystem, TObjectHashingStrategy, VirtualDirectoryImpl) RefreshWorker.java:272
+com.intellij.openapi.vfs.newvfs.persistent.RefreshWorker.processQueue(NewVirtualFileSystem, PersistentFS) RefreshWorker.java:124
+com.intellij.openapi.vfs.newvfs.persistent.RefreshWorker.scan() RefreshWorker.java:85
+com.intellij.openapi.vfs.newvfs.RefreshSessionImpl.scan() RefreshSessionImpl.java:147
+com.intellij.openapi.vfs.newvfs.RefreshQueueImpl.doScan(RefreshSessionImpl) RefreshQueueImpl.java:91
+com.intellij.openapi.vfs.newvfs.RefreshQueueImpl.lambda$queueSession$1(RefreshSessionImpl, TransactionId, ModalityState) RefreshQueueImpl.java:74
+com.intellij.openapi.vfs.newvfs.RefreshQueueImpl$$Lambda$242.run()
+java.util.concurrent.Executors$RunnableAdapter.call() Executors.java:511
+java.util.concurrent.FutureTask.run() FutureTask.java:266
+com.intellij.util.concurrency.BoundedTaskExecutor$2.run() BoundedTaskExecutor.java:212
+java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor$Worker) ThreadPoolExecutor.java:1142
+java.util.concurrent.ThreadPoolExecutor$Worker.run() ThreadPoolExecutor.java:617
+java.lang.Thread.run() Thread.java:745
+
+thread 24 State: WAITING CPU usage on sample: 0ms
+sun.misc.Unsafe.park(boolean, long) Unsafe.java (native)
+java.util.concurrent.locks.LockSupport.parkNanos(Object, long) LockSupport.java:215
+java.util.concurrent.SynchronousQueue$TransferStack.awaitFulfill(SynchronousQueue$TransferStack$SNode, boolean, long) SynchronousQueue.java:460
+java.util.concurrent.SynchronousQueue$TransferStack.transfer(Object, boolean, long) SynchronousQueue.java:362
+java.util.concurrent.SynchronousQueue.poll(long, TimeUnit) SynchronousQueue.java:941
+java.util.concurrent.ThreadPoolExecutor.getTask() ThreadPoolExecutor.java:1066
+java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor$Worker) ThreadPoolExecutor.java:1127
+java.util.concurrent.ThreadPoolExecutor$Worker.run() ThreadPoolExecutor.java:617
+java.lang.Thread.run() Thread.java:745
+
+thread 25 State: WAITING CPU usage on sample: 0ms
+sun.misc.Unsafe.park(boolean, long) Unsafe.java (native)
+java.util.concurrent.locks.LockSupport.parkNanos(Object, long) LockSupport.java:215
+java.util.concurrent.SynchronousQueue$TransferStack.awaitFulfill(SynchronousQueue$TransferStack$SNode, boolean, long) SynchronousQueue.java:460
+java.util.concurrent.SynchronousQueue$TransferStack.transfer(Object, boolean, long) SynchronousQueue.java:362
+java.util.concurrent.SynchronousQueue.poll(long, TimeUnit) SynchronousQueue.java:941
+
+Swing-Shell [DAEMON] State: WAITING CPU usage on sample: 0ms
+sun.misc.Unsafe.park(boolean, long) Unsafe.java (native)
+java.util.concurrent.locks.LockSupport.park(Object) LockSupport.java:175
+''' 
+    def threads = ThreadDumpParser.parse(text)
+    assert threads.collect { it.name } == ['thread 23', 'thread 24', 'thread 25', 'Swing-Shell']
+    assert threads.collect { it.daemon } == [false, false, false, true]
+  }
 
   void "test log is not a thread dump"() {
     def threads = ThreadDumpParser.parse("""\
diff --git a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
index 9bb017582907..68dab10c9d85 100644
--- a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
  * A TestCase for single PsiFile being opened in Editor conversion. See configureXXX and checkResultXXX method docs.
  */
 public abstract class LightCodeInsightTestCase extends LightPlatformCodeInsightTestCase {
-  private static final Pattern JDK_SELECT_PATTERN = Pattern.compile("Java([\\d.]+).java$");
+  private static final Pattern JDK_SELECT_PATTERN = Pattern.compile("Java([\\d.]+)(\\.java)?$");
 
   public static JavaPsiFacadeEx getJavaFacade() {
     return JavaPsiFacadeEx.getInstanceEx(ourProject);
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java
index d25cc9543633..529b52be6a25 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeConversionDescriptor.java
@@ -1,6 +1,5 @@
 package com.intellij.refactoring.typeMigration;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
@@ -15,8 +14,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class TypeConversionDescriptor extends TypeConversionDescriptorBase {
-  private static final Logger LOG = Logger.getInstance(TypeConversionDescriptor.class);
-
   private String myStringToReplace = null;
   private String myReplaceByString = "$";
   private PsiExpression myExpression;
@@ -75,9 +72,15 @@ public class TypeConversionDescriptor extends TypeConversionDescriptorBase {
   @Override
   public PsiExpression replace(PsiExpression expression, @NotNull TypeEvaluator evaluator) {
     if (getExpression() != null) expression = getExpression();
+    expression = adjustExpressionBeforeReplacement(expression);
     return replaceExpression(expression, getStringToReplace(), getReplaceByString());
   }
 
+  @NotNull
+  protected PsiExpression adjustExpressionBeforeReplacement(@NotNull PsiExpression expression) {
+    return expression;
+  }
+
   @NotNull
   public static PsiExpression replaceExpression(@NotNull PsiExpression expression,
                                                 String stringToReplace,
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
index 673d0c501d8e..7089f63bc112 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
@@ -50,7 +50,7 @@ public class TypeMigrationVariableTypeFixProvider implements ChangeVariableTypeQ
                          @Nullable("is null when called from inspection") Editor editor,
                          @NotNull PsiElement startElement,
                          @NotNull PsiElement endElement) {
-        runTypeMigrationOnVariable((PsiVariable)startElement, getReturnType(), editor, optimizeImports);
+        runTypeMigrationOnVariable((PsiVariable)startElement, getReturnType(), editor, optimizeImports, true);
       }
 
       @Override
@@ -63,14 +63,15 @@ public class TypeMigrationVariableTypeFixProvider implements ChangeVariableTypeQ
   public static void runTypeMigrationOnVariable(@NotNull PsiVariable variable,
                                                 @NotNull PsiType targetType,
                                                 @Nullable("is null when called from inspection") Editor editor,
-                                                boolean optimizeImports) {
+                                                boolean optimizeImports,
+                                                boolean allowDependentRoots) {
     Project project = variable.getProject();
     if (!FileModificationService.getInstance().prepareFileForWrite(variable.getContainingFile())) return;
     try {
       WriteAction.run(() -> variable.normalizeDeclaration());
       final TypeMigrationRules rules = new TypeMigrationRules();
       rules.setBoundScope(GlobalSearchScope.projectScope(project));
-      TypeMigrationProcessor.runHighlightingTypeMigration(project, editor, rules, variable, targetType, optimizeImports);
+      TypeMigrationProcessor.runHighlightingTypeMigration(project, editor, rules, variable, targetType, optimizeImports, allowDependentRoots);
       WriteAction.run(() -> JavaCodeStyleManager.getInstance(project).shortenClassReferences(variable));
       UndoUtil.markPsiFileForUndo(variable.getContainingFile());
     }
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
index 23de3c3fb7a7..f44dd37496b2 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
@@ -359,6 +359,7 @@ public class GuavaInspection extends BaseJavaLocalInspectionTool {
                                                           rules,
                                                           elements.toArray(new PsiElement[elements.size()]),
                                                           createMigrationTypeFunction(elements, types),
+                                                          true,
                                                           true);
     }
 
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java
index 609b63b4c8de..15e397c09558 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java
@@ -41,7 +41,7 @@ public class ConvertAtomicToLongAdderIntention extends PsiElementBaseIntentionAc
     if (variable != null) {
       final PsiType longAdder =
         JavaPsiFacade.getElementFactory(project).createTypeFromText(LongAdderConversionRule.JAVA_UTIL_CONCURRENT_ATOMIC_LONG_ADDER, element);
-      TypeMigrationVariableTypeFixProvider.runTypeMigrationOnVariable(variable, longAdder, null, false);
+      TypeMigrationVariableTypeFixProvider.runTypeMigrationOnVariable(variable, longAdder, null, false, false);
     }
   }
 
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
index c47383832fae..ca7e89128d00 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
@@ -9,31 +9,21 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.impl.AllowedApiFilterExtension;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.TypeConversionUtil;
-import com.intellij.refactoring.typeMigration.TypeConversionDescriptor;
-import com.intellij.refactoring.typeMigration.TypeEvaluator;
-import com.intellij.refactoring.typeMigration.TypeMigrationReplacementUtil;
-import com.intellij.refactoring.typeMigration.rules.AtomicConversionRule;
-import com.intellij.refactoring.util.RefactoringUtil;
+import com.intellij.refactoring.typeMigration.TypeMigrationVariableTypeFixProvider;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.Query;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.atomic.*;
 
-import static com.intellij.psi.util.TypeConversionUtil.isBinaryOperatorApplicable;
 import static com.intellij.util.ObjectUtils.assertNotNull;
 
 /**
@@ -102,145 +92,118 @@ public class ConvertFieldToAtomicIntention extends PsiElementBaseIntentionAction
 
   @Override
   public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
-    final PsiVariable psiVariable = getVariable(element);
-    LOG.assertTrue(psiVariable != null);
+    final PsiVariable var = getVariable(element);
+    LOG.assertTrue(var != null);
 
-    final Query<PsiReference> refs = ReferencesSearch.search(psiVariable);
+    final PsiType fromType = var.getType();
+    PsiClassType toType = getMigrationTargetType(project, element, fromType);
+    if (toType == null) return;
 
-    final Set<PsiElement> elements = new HashSet<>();
-    elements.add(element);
-    for (PsiReference reference : refs) {
-      elements.add(reference.getElement());
+    if (!FileModificationService.getInstance().preparePsiElementsForWrite(var)) return;
+    addExplicitInitializer(var);
+    String toTypeCanonicalText = toType.getCanonicalText();
+    TypeMigrationVariableTypeFixProvider.runTypeMigrationOnVariable(var, toType, editor, false, false);
+    postProcessVariable(var, toTypeCanonicalText);
+  }
+
+  static void addExplicitInitializer(@NotNull PsiVariable var) {
+    PsiExpression currentInitializer = var.getInitializer();
+    if (currentInitializer != null) return;
+    final PsiType type = var.getType();
+    String initializerText = null;
+    if (PsiType.BOOLEAN.equals(type)) {
+      initializerText = "false";
     }
-    if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return;
+    else if (type instanceof PsiPrimitiveType) {
+      initializerText = "0";
+    }
+    if (initializerText != null) {
+      String finalInitializerText = initializerText;
+      WriteAction.run(() -> {
+        PsiExpression initializer = JavaPsiFacade.getElementFactory(var.getProject()).createExpressionFromText(finalInitializerText, var);
+        if (var instanceof PsiLocalVariable) {
+          ((PsiLocalVariable)var).setInitializer(initializer);
+        }
+        else if (var instanceof PsiField) {
+          ((PsiField)var).setInitializer(initializer);
+        }
+      });
+    }
+  }
 
-    WriteAction.run(() -> {
-      psiVariable.normalizeDeclaration();
+  static void postProcessVariable(@NotNull PsiVariable var, @NotNull String toType) {
 
-      final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
-      final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
-      final PsiType fromType = psiVariable.getType();
-      PsiClassType toType;
-      final String atomicQualifiedName = myFromToMap.get(fromType);
-      if (atomicQualifiedName != null) {
-        final PsiClass atomicClass = psiFacade.findClass(atomicQualifiedName, GlobalSearchScope.allScope(project));
-        if (atomicClass == null) {//show warning
-          return;
-        }
-        toType = factory.createType(atomicClass);
-      }
-      else if (fromType instanceof PsiArrayType) {
-        final PsiClass atomicReferenceArrayClass =
-          psiFacade.findClass(AtomicReferenceArray.class.getName(), GlobalSearchScope.allScope(project));
-        if (atomicReferenceArrayClass == null) {//show warning
-          return;
-        }
-        final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
-        final PsiTypeParameter[] typeParameters = atomicReferenceArrayClass.getTypeParameters();
-        if (typeParameters.length == 1) {
-          PsiType componentType = ((PsiArrayType)fromType).getComponentType();
-          if (componentType instanceof PsiPrimitiveType) componentType = ((PsiPrimitiveType)componentType).getBoxedType(element);
-          substitutor.put(typeParameters[0], componentType);
-        }
-        toType = factory.createType(atomicReferenceArrayClass, factory.createSubstitutor(substitutor));
-      }
-      else {
-        final PsiClass atomicReferenceClass = psiFacade.findClass(AtomicReference.class.getName(), GlobalSearchScope.allScope(project));
-        if (atomicReferenceClass == null) {//show warning
-          return;
-        }
-        final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
-        final PsiTypeParameter[] typeParameters = atomicReferenceClass.getTypeParameters();
-        if (typeParameters.length == 1) {
-          PsiType type = fromType;
-          if (type instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(element);
-          substitutor.put(typeParameters[0], type);
-        }
-        toType = factory.createType(atomicReferenceClass, factory.createSubstitutor(substitutor));
-      }
-
-      try {
-        for (PsiReference reference : refs) {
-          PsiElement refElement = reference.getElement();
-          PsiElement psiElement = refElement;
-          if (psiElement instanceof PsiExpression) {
-            final PsiElement parent = psiElement.getParent();
-            if (parent instanceof PsiExpression && !(parent instanceof PsiReferenceExpression || parent instanceof PsiPolyadicExpression)) {
-              psiElement = parent;
-            }
-            if (psiElement instanceof PsiBinaryExpression) {
-              PsiBinaryExpression binary = (PsiBinaryExpression)psiElement;
-              if (isBinaryOpApplicable(binary.getOperationTokenType(), binary.getLOperand(), binary.getROperand(), refElement, toType)) {
-                continue;
-              }
-            }
-            else if (psiElement instanceof PsiAssignmentExpression) {
-              final PsiAssignmentExpression assignment = (PsiAssignmentExpression)psiElement;
-              final IElementType opSign = TypeConversionUtil.convertEQtoOperation(assignment.getOperationTokenType());
-              if (isBinaryOpApplicable(opSign, assignment.getLExpression(), assignment.getRExpression(), refElement, toType)) {
-                continue;
-              }
-            }
-            final TypeConversionDescriptor directConversion = AtomicConversionRule.findDirectConversion(psiElement, toType, fromType);
-            if (directConversion != null) {
-              TypeMigrationReplacementUtil
-                .replaceExpression((PsiExpression)psiElement, project, directConversion, new TypeEvaluator(null, null));
-            }
+    Project project = var.getProject();
+    if (var instanceof PsiField || CodeStyleSettingsManager.getSettings(project).GENERATE_FINAL_LOCALS) {
+      PsiModifierList modifierList = assertNotNull(var.getModifierList());
+      WriteAction.run(() -> {
+        if (var.getInitializer() == null) {
+          final PsiExpression newInitializer = JavaPsiFacade.getElementFactory(project).createExpressionFromText("new " + toType + "()", var);
+          if (var instanceof PsiLocalVariable) {
+            ((PsiLocalVariable)var).setInitializer(newInitializer);
           }
+          else if (var instanceof PsiField) {
+            ((PsiField)var).setInitializer(newInitializer);
+          }
+          JavaCodeStyleManager.getInstance(var.getProject()).shortenClassReferences(var.getInitializer());
         }
 
-        PsiExpression initializer = psiVariable.getInitializer();
-        if (initializer != null) {
-          if (initializer instanceof PsiArrayInitializerExpression) {
-            PsiExpression normalizedExpr =
-              RefactoringUtil.createNewExpressionFromArrayInitializer((PsiArrayInitializerExpression)initializer, psiVariable.getType());
-            initializer = (PsiExpression)initializer.replace(normalizedExpr);
-          }
-          final TypeConversionDescriptor directConversion =
-            AtomicConversionRule.wrapWithNewExpression(toType, fromType, initializer, element);
-          if (directConversion != null) {
-            TypeMigrationReplacementUtil.replaceExpression(initializer, project, directConversion, new TypeEvaluator(null, null));
-          }
-        }
-        else if (!assertNotNull(psiVariable.getModifierList()).hasModifierProperty(PsiModifier.FINAL)) {
-          final PsiExpression newInitializer = factory.createExpressionFromText("new " + toType.getCanonicalText() + "()", psiVariable);
-          if (psiVariable instanceof PsiLocalVariable) {
-            ((PsiLocalVariable)psiVariable).setInitializer(newInitializer);
-          }
-          else if (psiVariable instanceof PsiField) {
-            ((PsiField)psiVariable).setInitializer(newInitializer);
-          }
-          JavaCodeStyleManager.getInstance(project).shortenClassReferences(psiVariable.getInitializer());
-        }
+        modifierList.setModifierProperty(PsiModifier.FINAL, true);
+        modifierList.setModifierProperty(PsiModifier.VOLATILE, false);
 
-        PsiElement replaced = assertNotNull(psiVariable.getTypeElement()).replace(factory.createTypeElement(toType));
-        JavaCodeStyleManager.getInstance(project).shortenClassReferences(replaced);
+        JavaCodeStyleManager.getInstance(project).shortenClassReferences(var);
+        CodeStyleManager.getInstance(project).reformat(var);
+      });
+    }
+  }
 
-        if (psiVariable instanceof PsiField || CodeStyleSettingsManager.getSettings(project).GENERATE_FINAL_LOCALS) {
-          final PsiModifierList modifierList = assertNotNull(psiVariable.getModifierList());
-          modifierList.setModifierProperty(PsiModifier.FINAL, true);
-          modifierList.setModifierProperty(PsiModifier.VOLATILE, false);
-        }
+  @Nullable
+  private PsiClassType getMigrationTargetType(@NotNull Project project,
+                                              @NotNull PsiElement element,
+                                              @NotNull PsiType fromType) {
+    JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
+    PsiElementFactory factory = psiFacade.getElementFactory();
+    final String atomicQualifiedName = myFromToMap.get(fromType);
+    if (atomicQualifiedName != null) {
+      final PsiClass atomicClass = psiFacade.findClass(atomicQualifiedName, GlobalSearchScope.allScope(project));
+      if (atomicClass == null) {//show warning
+        return null;
       }
-      catch (IncorrectOperationException e) {
-        LOG.error(e);
+      return factory.createType(atomicClass);
+    }
+    else if (fromType instanceof PsiArrayType) {
+      final PsiClass atomicReferenceArrayClass =
+        psiFacade.findClass(AtomicReferenceArray.class.getName(), GlobalSearchScope.allScope(project));
+      if (atomicReferenceArrayClass == null) {//show warning
+        return null;
       }
-    });
+      final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
+      final PsiTypeParameter[] typeParameters = atomicReferenceArrayClass.getTypeParameters();
+      if (typeParameters.length == 1) {
+        PsiType componentType = ((PsiArrayType)fromType).getComponentType();
+        if (componentType instanceof PsiPrimitiveType) componentType = ((PsiPrimitiveType)componentType).getBoxedType(element);
+        substitutor.put(typeParameters[0], componentType);
+      }
+      return factory.createType(atomicReferenceArrayClass, factory.createSubstitutor(substitutor));
+    }
+    else {
+      final PsiClass atomicReferenceClass = psiFacade.findClass(AtomicReference.class.getName(), GlobalSearchScope.allScope(project));
+      if (atomicReferenceClass == null) {//show warning
+        return null;
+      }
+      final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
+      final PsiTypeParameter[] typeParameters = atomicReferenceClass.getTypeParameters();
+      if (typeParameters.length == 1) {
+        PsiType type = fromType;
+        if (type instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(element);
+        substitutor.put(typeParameters[0], type);
+      }
+      return factory.createType(atomicReferenceClass, factory.createSubstitutor(substitutor));
+    }
   }
 
   @Override
   public boolean startInWriteAction() {
     return false;
   }
-
-  private static boolean isBinaryOpApplicable(@Nullable IElementType opSign,
-                                              @NotNull PsiExpression lExpr,
-                                              @Nullable PsiExpression rExpr,
-                                              @NotNull PsiElement varElement,
-                                              @NotNull PsiType migrationType) {
-    if (opSign == null || rExpr == null) return false;
-    PsiType lType = lExpr == varElement ? migrationType : lExpr.getType();
-    PsiType rType = rExpr == varElement ? migrationType : rExpr.getType();
-    return isBinaryOperatorApplicable(opSign, lType, rType, true);
-  }
 }
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
index 0e03d91dd617..fcaf9defa8c4 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
@@ -4,32 +4,22 @@ import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.lang.java.JavaLanguage;
-import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.AllowedApiFilterExtension;
-import com.intellij.psi.impl.PsiDiamondTypeUtil;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.refactoring.typeMigration.*;
-import com.intellij.refactoring.typeMigration.rules.ThreadLocalConversionRule;
-import com.intellij.refactoring.util.RefactoringUtil;
+import com.intellij.refactoring.typeMigration.TypeMigrationVariableTypeFixProvider;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.Query;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
-
-import static com.intellij.util.ObjectUtils.assertNotNull;
 
 public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionAction implements LowPriorityAction {
   private static final Logger LOG = Logger.getInstance(ConvertFieldToThreadLocalIntention.class);
@@ -66,101 +56,39 @@ public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionA
   public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
     final PsiField psiField = PsiTreeUtil.getParentOfType(element, PsiField.class);
     LOG.assertTrue(psiField != null);
-    final Query<PsiReference> refs = ReferencesSearch.search(psiField);
 
-    final Set<PsiElement> elements = new HashSet<>();
-    elements.add(element);
-    for (PsiReference reference : refs) {
-      elements.add(reference.getElement());
-    }
-    if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return;
-    WriteAction.run(() -> {
-      psiField.normalizeDeclaration();
+    final PsiType fromType = psiField.getType();
 
-      final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
-      final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
-      final PsiType fromType = psiField.getType();
+    final PsiClassType toType = getMigrationTargetType(fromType, project, element);
+    if (toType == null) return;
 
-      final PsiClass threadLocalClass = psiFacade.findClass(ThreadLocal.class.getName(), GlobalSearchScope.allScope(project));
-      if (threadLocalClass == null) {//show warning
-        return;
-      }
-      final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
-      final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters();
-      if (typeParameters.length == 1) {
-        PsiType type = fromType;
-        if (fromType instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(element);
-        substitutor.put(typeParameters[0], type);
-      }
-      final PsiClassType toType = factory.createType(threadLocalClass, factory.createSubstitutor(substitutor));
-
-      try {
-        final TypeMigrationRules rules = new TypeMigrationRules();
-        rules.setBoundScope(GlobalSearchScope.fileScope(element.getContainingFile()));
-        final TypeMigrationLabeler labeler = new TypeMigrationLabeler(rules, toType);
-        labeler.getMigratedUsages(false, psiField);
-        for (PsiReference reference : refs) {
-          PsiElement psiElement = reference.getElement();
-          if (psiElement instanceof PsiExpression) {
-            final PsiElement parent = psiElement.getParent();
-            if (parent instanceof PsiExpression && !(parent instanceof PsiReferenceExpression || parent instanceof PsiPolyadicExpression)) {
-              psiElement = parent;
-            }
-            final TypeConversionDescriptor conversion =
-              ThreadLocalConversionRule.findDirectConversion(psiElement, toType, fromType, labeler);
-            if (conversion != null) {
-              TypeMigrationReplacementUtil.replaceExpression((PsiExpression)psiElement, project, conversion, new TypeEvaluator(null, null));
-            }
-          }
-        }
-
-        PsiExpression initializer = psiField.getInitializer();
-
-        if (initializer == null &&
-            !psiField.hasModifierProperty(PsiModifier.FINAL)) {
-          final PsiType type = psiField.getType();
-          String initializerText = null;
-          if (PsiType.BOOLEAN.equals(type)) {
-            initializerText = "false";
-          }
-          else if (type instanceof PsiPrimitiveType) {
-            initializerText = "0";
-          }
-          if (initializerText != null) {
-            psiField.setInitializer(factory.createExpressionFromText(initializerText, psiField));
-            initializer = psiField.getInitializer();
-          }
-        }
-        if (initializer != null) {
-          if (initializer instanceof PsiArrayInitializerExpression) {
-            PsiExpression normalizedExpr =
-              RefactoringUtil.createNewExpressionFromArrayInitializer((PsiArrayInitializerExpression)initializer, psiField.getType());
-            initializer = (PsiExpression)initializer.replace(normalizedExpr);
-          }
-          final TypeConversionDescriptor conversion = ThreadLocalConversionRule.wrapWithNewExpression(toType, fromType, initializer);
-          TypeMigrationReplacementUtil.replaceExpression(initializer, project, conversion, new TypeEvaluator(null, null));
-          CodeStyleManager.getInstance(project).reformat(psiField);
-        }
-        else if (!assertNotNull(psiField.getModifierList()).hasModifierProperty(PsiModifier.FINAL)) {
-          final String text = "new " + PsiDiamondTypeUtil.getCollapsedType(toType, psiField) + "()";
-          final PsiExpression newInitializer = factory.createExpressionFromText(text, psiField);
-          psiField.setInitializer(newInitializer);
-        }
-
-        assertNotNull(psiField.getTypeElement()).replace(factory.createTypeElement(toType));
-
-        final PsiModifierList modifierList = assertNotNull(psiField.getModifierList());
-        modifierList.setModifierProperty(PsiModifier.FINAL, true);
-        modifierList.setModifierProperty(PsiModifier.VOLATILE, false);
-      }
-      catch (IncorrectOperationException e) {
-        LOG.error(e);
-      }
-    });
+    if (!FileModificationService.getInstance().preparePsiElementsForWrite(psiField)) return;
+    ConvertFieldToAtomicIntention.addExplicitInitializer(psiField);
+    String toTypeCanonicalText = toType.getCanonicalText();
+    TypeMigrationVariableTypeFixProvider.runTypeMigrationOnVariable(psiField, toType, editor, false, false);
+    ConvertFieldToAtomicIntention.postProcessVariable(psiField, toTypeCanonicalText);
   }
 
   @Override
   public boolean startInWriteAction() {
     return false;
   }
+
+  @Nullable
+  private static PsiClassType getMigrationTargetType(@NotNull PsiType fromType, @NotNull Project project, @NotNull PsiElement context) {
+    JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
+    final PsiClass threadLocalClass = psiFacade.findClass(ThreadLocal.class.getName(), GlobalSearchScope.allScope(project));
+    if (threadLocalClass == null) {//show warning
+      return null;
+    }
+    final Map<PsiTypeParameter, PsiType> substitutor = ContainerUtil.newHashMap();
+    final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters();
+    if (typeParameters.length == 1) {
+      PsiType type = fromType;
+      if (fromType instanceof PsiPrimitiveType) type = ((PsiPrimitiveType)fromType).getBoxedType(context);
+      substitutor.put(typeParameters[0], type);
+    }
+    PsiElementFactory factory = psiFacade.getElementFactory();
+    return factory.createType(threadLocalClass, factory.createSubstitutor(substitutor));
+  }
 }
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java
index 2acf82df2ac3..2ba1e0fa7461 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/AtomicConversionRule.java
@@ -87,6 +87,9 @@ public class AtomicConversionRule extends TypeConversionRule {
     final PsiClass toTypeClass = PsiUtil.resolveClassInType(to);
     LOG.assertTrue(toTypeClass != null);
     final String qualifiedName = toTypeClass.getQualifiedName();
+    if (context instanceof PsiParenthesizedExpression) {
+      context = ParenthesesUtils.stripParentheses((PsiExpression)context);
+    }
     if (qualifiedName != null) {
       if (qualifiedName.equals(AtomicInteger.class.getName()) || qualifiedName.equals(AtomicLong.class.getName())) {
 
@@ -271,12 +274,33 @@ public class AtomicConversionRule extends TypeConversionRule {
           final PsiClassType boxedFromType = ((PsiPrimitiveType)from).getBoxedType(atomicClass);
           LOG.assertTrue(boxedFromType != null);
           if (!TypeConversionUtil.isAssignable(initial, boxedFromType)) {
-            return new TypeConversionDescriptor("$val$", "new " + typeText + "((" + unboxedInitialType.getCanonicalText() + ")$val$)", expression);
+            return new ArrayInitializerAwareConversionDescriptor("$val$", "new " + typeText + "((" + unboxedInitialType.getCanonicalText() + ")$val$)", expression);
           }
         }
       }
     }
-    return new TypeConversionDescriptor("$val$", "new " + typeText + "($val$)", expression);
+    return new ArrayInitializerAwareConversionDescriptor("$val$", "new " + typeText + "($val$)", expression);
+  }
+
+  static class ArrayInitializerAwareConversionDescriptor extends TypeConversionDescriptor {
+    public ArrayInitializerAwareConversionDescriptor(String stringToReplace,
+                                                     String replaceByString,
+                                                     PsiExpression expression) {
+      super(stringToReplace, replaceByString, expression);
+    }
+
+    @NotNull
+    @Override
+    protected PsiExpression adjustExpressionBeforeReplacement(@NotNull PsiExpression expression) {
+      if (expression instanceof PsiArrayInitializerExpression) {
+        PsiElementFactory elementFactory = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory();
+        return (PsiExpression)expression.replace(elementFactory.createExpressionFromText("new " +
+                                                                                         TypeConversionUtil.erasure(expression.getType()).getCanonicalText() +
+                                                                                         expression.getText(),
+                                                                                         expression));
+      }
+      return expression;
+    }
   }
 
   @Nullable
@@ -286,6 +310,9 @@ public class AtomicConversionRule extends TypeConversionRule {
     final PsiElement parent = context.getParent();
     final PsiElement parentParent = parent.getParent();
 
+    if (context instanceof PsiReferenceExpression && isReferenceToLengthField((PsiReferenceExpression)context)) {
+      return new TypeConversionDescriptor("$qualifier$.length", "$qualifier$.length()");
+    }
     if (parent instanceof PsiAssignmentExpression) {
       final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent;
       final IElementType operationSign = assignmentExpression.getOperationTokenType();
@@ -344,9 +371,6 @@ public class AtomicConversionRule extends TypeConversionRule {
     if (context instanceof PsiArrayAccessExpression) {
       return new TypeConversionDescriptor("$qualifier$[$idx$]", "$qualifier$.get($idx$)", (PsiExpression)context);
     }
-    if (parent instanceof PsiReferenceExpression && isReferenceToLengthField((PsiReferenceExpression)parent)) {
-      return new TypeConversionDescriptor("$qualifier$.length", "$qualifier$.length()", (PsiExpression)parent);
-    }
     return null;
   }
 
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java
index bf7e2cc746aa..9831f8c51290 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java
@@ -91,6 +91,10 @@ public class ThreadLocalConversionRule extends TypeConversionRule {
       return new TypeConversionDescriptor("$qualifier$" + sign + "$val$", toPrimitive("$qualifier$.get()", from, context) + " " + sign + " $val$");
     }
 
+    if (parent instanceof PsiVariable && ((PsiVariable)parent).getInitializer() == context) {
+      return wrapWithNewExpression(to, from, (PsiExpression)context);
+    }
+
     if (parent instanceof PsiExpressionStatement) {
       if (context instanceof PsiPostfixExpression) {
         final PsiPostfixExpression postfixExpression = (PsiPostfixExpression)context;
@@ -169,12 +173,12 @@ public class ThreadLocalConversionRule extends TypeConversionRule {
                                                                   PsiExpression initializer,
                                                                   String boxedTypeName) {
     if (PsiUtil.isLanguageLevel8OrHigher(initializer)) {
-      return "java.lang.ThreadLocal.withInitial(() -> " + initializer.getText() + ")";
+      return "java.lang.ThreadLocal.withInitial(() -> $qualifier$)";
     }
     return "new " +
            to.getCanonicalText() +
            "() {\n" +
-           "@Override \n" +
+           "@Override\n" +
            "protected " +
            boxedTypeName +
            " initialValue() {\n" +
@@ -183,9 +187,7 @@ public class ThreadLocalConversionRule extends TypeConversionRule {
                           ? initializer.getText()
                           : (from instanceof PsiPrimitiveType ? "new " +
                                                                 ((PsiPrimitiveType)from).getBoxedTypeName() +
-                                                                "(" +
-                                                                initializer.getText() +
-                                                                ")" : initializer.getText())) +
+                                                                "($qualifier$)" : "$qualifier$")) +
            ";\n" +
            "}\n" +
            "}";
@@ -242,7 +244,7 @@ public class ThreadLocalConversionRule extends TypeConversionRule {
     return toBoxed(arg, from, context);
   }
 
-  private static class WrappingWithInnerClassOrLambdaDescriptor extends TypeConversionDescriptor {
+  private static class WrappingWithInnerClassOrLambdaDescriptor extends AtomicConversionRule.ArrayInitializerAwareConversionDescriptor {
     private final List<PsiVariable> myVariablesToMakeFinal;
 
     private WrappingWithInnerClassOrLambdaDescriptor(@NonNls final String stringToReplace,
diff --git a/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java b/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
index d4de1aa249ac..88b67ebaf3d7 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
@@ -1,6 +1,7 @@
 package com.intellij.codeInsight;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
+import com.intellij.refactoring.typeMigration.TypeMigrationProcessor;
 import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -24,6 +25,18 @@ public class ConvertToAtomicIntentionTest extends LightQuickFixParameterizedTest
     return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    TypeMigrationProcessor.ourSkipFailedConversionInTestMode = true;
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    TypeMigrationProcessor.ourSkipFailedConversionInTestMode = false;
+    super.tearDown();
+  }
+
   public void test() throws Exception {
     doAllTests();
   }
diff --git a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
index 1f05c9b3bc6b..c01576fd5dab 100644
--- a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
@@ -52,7 +52,8 @@ public class ChangeTypeSignatureTest extends LightCodeInsightTestCase {
       new TypeMigrationProcessor(getProject(),
                                  new PsiElement[]{parameterList},
                                  Functions.constant(PsiSubstitutor.EMPTY.put(superClass.getTypeParameters()[0], migrationType).substitute(new PsiImmediateClassType(superClass, PsiSubstitutor.EMPTY))),
-                                 rules).run();
+                                 rules,
+                                 true).run();
       if (success) {
         checkResultByFile(dataPath + getTestName(false) + ".java.after");
       } else {
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
index 36dc0634ddfa..9571f6fac611 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
@@ -229,7 +229,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
 
   private static class TestTypeMigrationProcessor extends TypeMigrationProcessor {
     public TestTypeMigrationProcessor(final Project project, final PsiElement[] roots, final PsiType migrationType, final TypeMigrationRules rules) {
-      super(project, roots, Functions.constant(migrationType), rules);
+      super(project, roots, Functions.constant(migrationType), rules, true);
     }
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after1.java b/java/typeMigration/testData/intentions/atomic/after1.java
index 853f715fd8c4..ef8057593d95 100644
--- a/java/typeMigration/testData/intentions/atomic/after1.java
+++ b/java/typeMigration/testData/intentions/atomic/after1.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicIntegerArray field= new AtomicIntegerArray(foo());
+    final AtomicIntegerArray field = new AtomicIntegerArray(foo());
   int[] foo() {
     return null;
   }
diff --git a/java/typeMigration/testData/intentions/atomic/after10.java b/java/typeMigration/testData/intentions/atomic/after10.java
index 685e3fb710e2..34569c8e2114 100644
--- a/java/typeMigration/testData/intentions/atomic/after10.java
+++ b/java/typeMigration/testData/intentions/atomic/after10.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicInteger o = new AtomicInteger(0);
+    final AtomicInteger o = new AtomicInteger(0);
 
   void foo() {
     boolean b = this.o.get() == 1;
diff --git a/java/typeMigration/testData/intentions/atomic/after13.java b/java/typeMigration/testData/intentions/atomic/after13.java
index dea58d02e88c..c92136bb5030 100644
--- a/java/typeMigration/testData/intentions/atomic/after13.java
+++ b/java/typeMigration/testData/intentions/atomic/after13.java
@@ -2,5 +2,5 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicInteger i = new AtomicInteger(0);
+    final AtomicInteger i = new AtomicInteger(0);
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after14.java b/java/typeMigration/testData/intentions/atomic/after14.java
index 6109d4106e9b..79e0560becad 100644
--- a/java/typeMigration/testData/intentions/atomic/after14.java
+++ b/java/typeMigration/testData/intentions/atomic/after14.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 // "Convert to atomic" "true"
 class T {
-  private final AtomicLong l = new AtomicLong(10L);
+    private final AtomicLong l = new AtomicLong(10L);
 
   public synchronized void update(long m) {
     l.set(m);
diff --git a/java/typeMigration/testData/intentions/atomic/after2.java b/java/typeMigration/testData/intentions/atomic/after2.java
index 2c2ad94beeb0..2c71c0825534 100644
--- a/java/typeMigration/testData/intentions/atomic/after2.java
+++ b/java/typeMigration/testData/intentions/atomic/after2.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicReferenceArray<Object> field= new AtomicReferenceArray<>(foo());
+    final AtomicReferenceArray<Object> field = new AtomicReferenceArray<>(foo());
   Object[] foo() {
     return null;
   }
diff --git a/java/typeMigration/testData/intentions/atomic/after3.java b/java/typeMigration/testData/intentions/atomic/after3.java
index 505349d5dc36..7804ef5d08e6 100644
--- a/java/typeMigration/testData/intentions/atomic/after3.java
+++ b/java/typeMigration/testData/intentions/atomic/after3.java
@@ -2,6 +2,6 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicIntegerArray field= new AtomicIntegerArray(new int[]{1});
+    final AtomicIntegerArray field = new AtomicIntegerArray(new int[]{1});
 
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after4.java b/java/typeMigration/testData/intentions/atomic/after4.java
index e268b2604404..9a46fadf087a 100644
--- a/java/typeMigration/testData/intentions/atomic/after4.java
+++ b/java/typeMigration/testData/intentions/atomic/after4.java
@@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
- final AtomicInteger i = new AtomicInteger(0);
+    final AtomicInteger i = new AtomicInteger(0);
 
  int j = i.get() + 5;
- String s = "i = " + i.get();
+ String s = "i = " + i;
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after5.java b/java/typeMigration/testData/intentions/atomic/after5.java
index 82ff84c68e75..6bd1c2f36e89 100644
--- a/java/typeMigration/testData/intentions/atomic/after5.java
+++ b/java/typeMigration/testData/intentions/atomic/after5.java
@@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
- final AtomicInteger i = new AtomicInteger(0 + 8);
+    final AtomicInteger i = new AtomicInteger(0 + 8);
 
  int j = i.get() + 5;
- String s = "i = " + i.get();
+ String s = "i = " + i;
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after6.java b/java/typeMigration/testData/intentions/atomic/after6.java
index f0120300e0f9..c5c018c7f17f 100644
--- a/java/typeMigration/testData/intentions/atomic/after6.java
+++ b/java/typeMigration/testData/intentions/atomic/after6.java
@@ -2,5 +2,5 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
 
 // "Convert to atomic" "true"
 class Test {
- final AtomicIntegerArray i = new AtomicIntegerArray(new int[0]);
+    final AtomicIntegerArray i = new AtomicIntegerArray(new int[0]);
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after7.java b/java/typeMigration/testData/intentions/atomic/after7.java
index 19336f0bc61b..7231e3c259ad 100644
--- a/java/typeMigration/testData/intentions/atomic/after7.java
+++ b/java/typeMigration/testData/intentions/atomic/after7.java
@@ -2,10 +2,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicInteger o = new AtomicInteger(0);
+    final AtomicInteger o = new AtomicInteger(0);
   int j = o.get();
 
   void foo() {
-    while ((o = j) != 0) {}
+    while ((o.set(j)) != 0) {}
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after8.java b/java/typeMigration/testData/intentions/atomic/after8.java
index bdfbd5b03a4d..7231e3c259ad 100644
--- a/java/typeMigration/testData/intentions/atomic/after8.java
+++ b/java/typeMigration/testData/intentions/atomic/after8.java
@@ -2,10 +2,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicInteger o = new AtomicInteger();
+    final AtomicInteger o = new AtomicInteger(0);
   int j = o.get();
 
   void foo() {
-    while ((o = j) != 0) {}
+    while ((o.set(j)) != 0) {}
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/after9.java b/java/typeMigration/testData/intentions/atomic/after9.java
index c462a10961d4..c31f7835f36e 100644
--- a/java/typeMigration/testData/intentions/atomic/after9.java
+++ b/java/typeMigration/testData/intentions/atomic/after9.java
@@ -2,14 +2,14 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicInteger o;
+    final AtomicInteger o = new AtomicInteger(0);
   int j = o.get();
 
   Test(int o) {
-    this.o = new AtomicInteger(o);
+    this.o.set(o);
   }
 
   void foo() {
-    while ((o = j) != 0) {}
+    while ((o.set(j)) != 0) {}
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/afterArrayInitializer.java b/java/typeMigration/testData/intentions/atomic/afterArrayInitializer.java
index f2b51fa36440..ee554f41ab0c 100644
--- a/java/typeMigration/testData/intentions/atomic/afterArrayInitializer.java
+++ b/java/typeMigration/testData/intentions/atomic/afterArrayInitializer.java
@@ -2,5 +2,5 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicReferenceArray<String> field= new AtomicReferenceArray<>(new String[]{});
+    final AtomicReferenceArray<String> field = new AtomicReferenceArray<>(new String[]{});
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/atomic/afterAssignmentOp.java b/java/typeMigration/testData/intentions/atomic/afterAssignmentOp.java
index 0bb7d49f37e1..6aac0f12d512 100644
--- a/java/typeMigration/testData/intentions/atomic/afterAssignmentOp.java
+++ b/java/typeMigration/testData/intentions/atomic/afterAssignmentOp.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 // "Convert to atomic" "true"
 class A {
-  final AtomicLong x = new AtomicLong(0);
+    final AtomicLong x = new AtomicLong(0);
 
   public void testAtomicLong() {
     x.getAndIncrement();
diff --git a/java/typeMigration/testData/intentions/atomic/afterAtomicArrayLength.java b/java/typeMigration/testData/intentions/atomic/afterAtomicArrayLength.java
index 76bd5940cb3a..5129b22b4809 100644
--- a/java/typeMigration/testData/intentions/atomic/afterAtomicArrayLength.java
+++ b/java/typeMigration/testData/intentions/atomic/afterAtomicArrayLength.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicIntegerArray ii = new AtomicIntegerArray(new int[12]);
+    final AtomicIntegerArray ii = new AtomicIntegerArray(new int[12]);
 
   void m() {
     int k = ii.length();
diff --git a/java/typeMigration/testData/intentions/atomic/afterExcl.java b/java/typeMigration/testData/intentions/atomic/afterExcl.java
index 72f91198ce3d..48c48c88ba72 100644
--- a/java/typeMigration/testData/intentions/atomic/afterExcl.java
+++ b/java/typeMigration/testData/intentions/atomic/afterExcl.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 // "Convert to atomic" "true"
 class Test {
-  final AtomicBoolean field= new AtomicBoolean(false);
+    final AtomicBoolean field = new AtomicBoolean(false);
   {
     boolean b = !field.get();
   }
diff --git a/java/typeMigration/testData/intentions/atomic/afterNormalize.java b/java/typeMigration/testData/intentions/atomic/afterNormalize.java
index c454d5787206..1c19518830b5 100644
--- a/java/typeMigration/testData/intentions/atomic/afterNormalize.java
+++ b/java/typeMigration/testData/intentions/atomic/afterNormalize.java
@@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 // "Convert to atomic" "true"
 class X {
-  private final AtomicReference<String> s = new AtomicReference<>("");
+    private final AtomicReference<String> s = new AtomicReference<>("");
     private String t;
     private String u;
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal/after6.java b/java/typeMigration/testData/intentions/threadLocal/after6.java
index d153a6579061..4ac6c8bf78e1 100644
--- a/java/typeMigration/testData/intentions/threadLocal/after6.java
+++ b/java/typeMigration/testData/intentions/threadLocal/after6.java
@@ -1,7 +1,7 @@
 // "Convert to ThreadLocal" "true"
 class Test {
-  static final ThreadLocal<Integer> field;
+    static final ThreadLocal<Integer> field = new ThreadLocal<Integer>();
   static {
-    field = ThreadLocal.withInitial(() -> new Integer(0));
+    field.set(new Integer(0));
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal/afterCycle.java b/java/typeMigration/testData/intentions/threadLocal/afterCycle.java
new file mode 100644
index 000000000000..b2d5d06814ba
--- /dev/null
+++ b/java/typeMigration/testData/intentions/threadLocal/afterCycle.java
@@ -0,0 +1,8 @@
+// "Convert to ThreadLocal" "true"
+import java.util.Arrays;
+
+class Foo {
+    private final ThreadLocal<char[]> lookahead = ThreadLocal.withInitial(() -> new char[0]);
+
+  { lookahead.set(Arrays.copyOf(lookahead.get(), 42));}
+}
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal/afterFieldAssignmentFromNonFinalParameter.java b/java/typeMigration/testData/intentions/threadLocal/afterFieldAssignmentFromNonFinalParameter.java
index 654691a7f2c9..f792c3c1e7bd 100644
--- a/java/typeMigration/testData/intentions/threadLocal/afterFieldAssignmentFromNonFinalParameter.java
+++ b/java/typeMigration/testData/intentions/threadLocal/afterFieldAssignmentFromNonFinalParameter.java
@@ -1,12 +1,11 @@
 // "Convert to ThreadLocal" "true"
 class Main {
-  private final ThreadLocal<Boolean> property;
+    private final ThreadLocal<Boolean> property = ThreadLocal.withInitial(() -> false);
 
   Main3(boolean property) {
     if (property) {
       property = false;
     }
-      boolean finalProperty = property;
-      this.property = ThreadLocal.withInitial(() -> finalProperty);
+    this.property.set(property);
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal/afterFinalField.java b/java/typeMigration/testData/intentions/threadLocal/afterFinalField.java
index da8f5235f329..172cae3957a0 100644
--- a/java/typeMigration/testData/intentions/threadLocal/afterFinalField.java
+++ b/java/typeMigration/testData/intentions/threadLocal/afterFinalField.java
@@ -1,8 +1,8 @@
 // "Convert to ThreadLocal" "true"
 class Foo {
-  private final ThreadLocal<Boolean> property;
+    private final ThreadLocal<Boolean> property = ThreadLocal.withInitial(() -> false);
 
   Foo(boolean property) {
-    this.property = ThreadLocal.withInitial(() -> property);
+    this.property.set(property);
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal/beforeCycle.java b/java/typeMigration/testData/intentions/threadLocal/beforeCycle.java
new file mode 100644
index 000000000000..257fdfd4e425
--- /dev/null
+++ b/java/typeMigration/testData/intentions/threadLocal/beforeCycle.java
@@ -0,0 +1,8 @@
+// "Convert to ThreadLocal" "true"
+import java.util.Arrays;
+
+class Foo {
+  private char[] loo<caret>kahead = new char[0];
+
+  { lookahead = Arrays.copyOf(lookahead, 42);}
+}
\ No newline at end of file
diff --git a/java/typeMigration/testData/intentions/threadLocal6/afterJava6.java b/java/typeMigration/testData/intentions/threadLocal6/afterJava6.java
index 77bd711defff..f116d3848f33 100644
--- a/java/typeMigration/testData/intentions/threadLocal6/afterJava6.java
+++ b/java/typeMigration/testData/intentions/threadLocal6/afterJava6.java
@@ -1,13 +1,13 @@
 // "Convert to ThreadLocal" "true"
 class Main {
-  private final ThreadLocal<Boolean> property;
-
-  Main3(final boolean property) {
-    this.property = new ThreadLocal<Boolean>() {
+    private final ThreadLocal<Boolean> property = new ThreadLocal<Boolean>() {
         @Override
         protected Boolean initialValue() {
-            return property;
+            return false;
         }
     };
+
+  Main3(boolean property) {
+    this.property.set(property);
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items
index 0d306b0b4747..0c9576812898 100644
--- a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items
+++ b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.items
@@ -6,6 +6,7 @@ PsiReferenceExpression:s : java.util.concurrent.atomic.AtomicReference<java.lang
 Conversions:
 "" -> new java.util.concurrent.atomic.AtomicReference<java.lang.String>($val$) $val$
 s -> $qualifier$.get() $qualifier$ s
+s -> $qualifier$.get() $qualifier$ s
 
 New expression type changes:
 Fails:
diff --git a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java
index cb32e0ba130b..c9b39344fce4 100644
--- a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java
+++ b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directString/after/Test.java
@@ -4,7 +4,7 @@ class Test {
     AtomicReference<String> s = new AtomicReference<String>("");
 
     void foo() {
-        if (s == null) {
+        if (s.get() == null) {
            System.out.println(s.get());
         }
     }
diff --git a/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items b/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items
index 29d4312a8580..bf665487b0c2 100644
--- a/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items
+++ b/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.items
@@ -4,8 +4,14 @@ PsiReferenceExpression:myS : java.lang.ThreadLocal<java.lang.String>
 PsiReferenceExpression:myS : java.lang.ThreadLocal<java.lang.String>
 
 Conversions:
+"" -> new java.lang.ThreadLocal<java.lang.String>() {
+@Override
+protected java.lang.String initialValue() {
+  return "";
+}
+} $qualifier$ ""
+myS -> $qualifier$.get() $qualifier$ myS
 myS -> $qualifier$.get() $qualifier$ myS
 
 New expression type changes:
 Fails:
-""->java.lang.ThreadLocal<java.lang.String>
diff --git a/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java b/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java
index 949869096327..3e800d3fcd11 100644
--- a/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java
+++ b/java/typeMigration/testData/refactoring/typeMigrationByThreadLocal/directString/after/Test.java
@@ -1,8 +1,13 @@
 class Test {
-    ThreadLocal<String> myS = "";
+    ThreadLocal<String> myS = new ThreadLocal<String>() {
+        @Override
+        protected String initialValue() {
+            return "";
+        }
+    };
 
     void foo() {
-        if (myS == null) {
+        if (myS.get() == null) {
             System.out.println(myS.get());
         }
     }
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/QuickFixWrapper.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/QuickFixWrapper.java
index 15c78ec8a58d..29247b78128d 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/QuickFixWrapper.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/QuickFixWrapper.java
@@ -40,8 +40,7 @@ public class QuickFixWrapper implements IntentionAction {
   private static final Logger LOG = Logger.getInstance("com.intellij.codeInspection.ex.QuickFixWrapper");
 
   private final ProblemDescriptor myDescriptor;
-  private final int myFixNumber;
-
+  private final LocalQuickFix myFix;
 
   @NotNull
   public static IntentionAction wrap(@NotNull ProblemDescriptor descriptor, int fixNumber) {
@@ -50,12 +49,12 @@ public class QuickFixWrapper implements IntentionAction {
     LOG.assertTrue(fixes != null && fixes.length > fixNumber);
 
     final QuickFix fix = fixes[fixNumber];
-    return fix instanceof IntentionAction ? (IntentionAction)fix : new QuickFixWrapper(descriptor, fixNumber);
+    return fix instanceof IntentionAction ? (IntentionAction)fix : new QuickFixWrapper(descriptor, (LocalQuickFix)fix);
   }
 
-  private QuickFixWrapper(@NotNull ProblemDescriptor descriptor, int fixNumber) {
+  private QuickFixWrapper(@NotNull ProblemDescriptor descriptor, @NotNull LocalQuickFix fix) {
     myDescriptor = descriptor;
-    myFixNumber = fixNumber;
+    myFix = fix;
   }
 
   @Override
@@ -67,7 +66,7 @@ public class QuickFixWrapper implements IntentionAction {
   @Override
   @NotNull
   public String getFamilyName() {
-    return myDescriptor.getFixes()[myFixNumber].getName();
+    return getFix().getName();
   }
 
   @Override
@@ -104,8 +103,9 @@ public class QuickFixWrapper implements IntentionAction {
     return getFix().getElementToMakeWritable(file);
   }
 
+  @NotNull
   public LocalQuickFix getFix() {
-    return (LocalQuickFix)myDescriptor.getFixes()[myFixNumber];
+    return myFix;
   }
 
   @TestOnly
diff --git a/platform/core-api/src/com/intellij/openapi/components/BaseComponent.java b/platform/core-api/src/com/intellij/openapi/components/BaseComponent.java
index 557049e9b490..145341a0cdf2 100644
--- a/platform/core-api/src/com/intellij/openapi/components/BaseComponent.java
+++ b/platform/core-api/src/com/intellij/openapi/components/BaseComponent.java
@@ -30,7 +30,7 @@ public interface BaseComponent extends NamedComponent {
   }
 
   /**
-   * @see {@link com.intellij.openapi.Disposable}
+   * @see com.intellij.openapi.Disposable
    */
   default void disposeComponent() {
   }
diff --git a/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java b/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
index 120ebc1a1205..873063afff53 100644
--- a/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
+++ b/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
@@ -37,10 +37,6 @@ public class SimpleModificationTracker implements ModificationTracker {
   }
 
   public void incModificationCount() {
-    incAndGetModificationCount();
-  }
-
-  public long incAndGetModificationCount() {
-    return UPDATER.incrementAndGet(this);
+    UPDATER.incrementAndGet(this);
   }
 }
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/util/indexing/ID.java b/platform/core-api/src/com/intellij/util/indexing/ID.java
index b6dda901cf96..f8d66f8b2ff5 100644
--- a/platform/core-api/src/com/intellij/util/indexing/ID.java
+++ b/platform/core-api/src/com/intellij/util/indexing/ID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -86,7 +86,7 @@ public class ID<K, V> extends IndexId<K,V> {
     myUniqueId = stringToId(name);
 
     final ID old = ourRegistry.put(myUniqueId, this);
-    assert old == null;
+    assert old == null : "ID with name '" + name + "' is already registered";
   }
 
   private static short stringToId(String name) {
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
index 592131717c50..eb4f7ee107c9 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
@@ -18,7 +18,6 @@ package com.intellij.psi.impl.source.resolve;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
@@ -143,6 +142,12 @@ public class ResolveCache {
     if (result instanceof ResolveResult) {
       ensureValidPsi((ResolveResult)result);
     }
+    else if (result instanceof ResolveResult[]) {
+      ensureValidResults((ResolveResult[])result);
+    }
+    else if (result instanceof PsiElement) {
+      PsiUtilCore.ensureValid((PsiElement)result);
+    }
 
     if (stamp.mayCacheNow()) {
       cache(ref, map, result);
@@ -187,9 +192,7 @@ public class ResolveCache {
     result = needToPreventRecursion ? myGuard.doPreventingRecursion(Pair.create(ref, incompleteCode), true,
                                                                     () -> resolver.resolve(ref, containingFile, incompleteCode)) : resolver.resolve(ref, containingFile, incompleteCode);
     if (result != null) {
-      for (ResolveResult resolveResult : result) {
-        ensureValidPsi(resolveResult);
-      }
+      ensureValidResults(result);
     }
 
     if (stamp.mayCacheNow()) {
@@ -198,6 +201,12 @@ public class ResolveCache {
     return result == null ? ResolveResult.EMPTY_ARRAY : result;
   }
 
+  private static void ensureValidResults(ResolveResult[] result) {
+    for (ResolveResult resolveResult : result) {
+      ensureValidPsi(resolveResult);
+    }
+  }
+
   private static void ensureValidPsi(ResolveResult resolveResult) {
     PsiElement element = resolveResult.getElement();
     if (element != null) {
diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java
index 5f5af446cab8..6f4488d3b5a3 100644
--- a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java
+++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java
@@ -30,7 +30,6 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static com.intellij.util.ArrayUtil.toObjectArray;
@@ -165,13 +164,28 @@ public class SetEditorSettingsAction extends ActionGroup implements DumbAware {
   @NotNull
   @Override
   public AnAction[] getChildren(@Nullable AnActionEvent e) {
-    List<AnAction> result = new ArrayList<>();
-    ContainerUtil.addAll(result, myActions);
-    result.add(Separator.getInstance());
-    result.add(ActionManager.getInstance().getAction(IdeActions.GROUP_DIFF_EDITOR_GUTTER_POPUP));
+    AnAction[] children = ((ActionGroup)ActionManager.getInstance().getAction(IdeActions.GROUP_DIFF_EDITOR_GUTTER_POPUP)).getChildren(e);
+    AnAction editorSettingsGroup = ActionManager.getInstance().getAction("Diff.EditorGutterPopupMenu.EditorSettings");
+
+    DefaultActionGroup ourGroup = new DefaultActionGroup();
+    ourGroup.add(Separator.getInstance());
+    ourGroup.addAll(myActions);
+    ourGroup.add(editorSettingsGroup);
+    ourGroup.add(Separator.getInstance());
+
+    List<AnAction> result = ContainerUtil.newArrayList(children);
+    replaceOrAppend(result, editorSettingsGroup, ourGroup);
+
     return toObjectArray(result, AnAction.class);
   }
 
+  private static <T> void replaceOrAppend(List<T> list, T from, T to) {
+    int index = list.indexOf(from);
+    if (index == -1) index = list.size();
+    list.remove(from);
+    list.add(index, to);
+  }
+
   private abstract class EditorSettingToggleAction extends ToggleAction implements DumbAware, EditorSettingAction {
     private EditorSettingToggleAction(@NotNull String actionId) {
       ActionUtil.copyFrom(this, actionId);
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
index fdc42fc91cd3..150fff81fd55 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
@@ -140,6 +140,11 @@ public class BranchActionGroupPopup extends FlatSpeedSearchPopup {
           processOnSizeChanged();
         }
       }
+
+      @Override
+      public void componentHidden(ComponentEvent e) {
+        popupWindow.removeComponentListener(this);
+      }
     });
     if (dimensionKey != null) {
       addPopupListener(new JBPopupAdapter() {
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
index ecf2729bc1a8..7887342c4e10 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
@@ -167,12 +167,14 @@ public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter {
   }
 
   protected boolean updateLayers() { return false; }
+  
+  protected boolean updateLayers(@NotNull DocumentEvent e) { return updateLayers(); }
 
   @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
   @Override
   public void documentChanged(DocumentEvent e) {
     // do NOT synchronize before updateLayers due to deadlock with PsiLock
-    boolean changed = updateLayers();
+    boolean changed = updateLayers(e);
 
     //noinspection SynchronizeOnThis
     synchronized (this) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
index fe07f250f5e7..b0fcc05c0fe8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
@@ -59,14 +59,12 @@ import com.intellij.openapi.roots.ModuleRootEvent;
 import com.intellij.openapi.roots.ModuleRootListener;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.SimpleModificationTracker;
 import com.intellij.openapi.util.UserDataHolderEx;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileListener;
-import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.openapi.vfs.VirtualFilePropertyEvent;
+import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.impl.status.TogglePopupHintsPanel;
@@ -94,7 +92,10 @@ import java.util.List;
 /**
  * @author cdr
  */
-public class DaemonListeners implements Disposable {
+public class DaemonListeners
+  extends SimpleModificationTracker // modCount will change whenever daemon-worthy event happens
+  implements Disposable {
+
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.DaemonListeners");
 
   private final Project myProject;
@@ -280,7 +281,7 @@ public class DaemonListeners implements Disposable {
     });
 
     connection.subscribe(PowerSaveMode.TOPIC, () -> stopDaemon(true, "Power save mode change"));
-    connection.subscribe(EditorColorsManager.TOPIC, scheme -> stopDaemonAndRestartAllFiles("Editor color scheme changed"));
+    connection.subscribe(EditorColorsManager.TOPIC, __ -> stopDaemonAndRestartAllFiles("Editor color scheme changed"));
 
     commandProcessor.addCommandListener(new MyCommandListener(), this);
     application.addApplicationListener(new MyApplicationListener(), this);
@@ -291,6 +292,7 @@ public class DaemonListeners implements Disposable {
     virtualFileManager.addVirtualFileListener(new VirtualFileListener() {
       @Override
       public void propertyChanged(@NotNull VirtualFilePropertyEvent event) {
+        incModificationCount();
         String propertyName = event.getPropertyName();
         if (VirtualFile.PROP_NAME.equals(propertyName)) {
           stopDaemonAndRestartAllFiles("Virtual file name changed");
@@ -318,6 +320,31 @@ public class DaemonListeners implements Disposable {
           stopDaemon(true, "Virtual file property change");
         }
       }
+
+      @Override
+      public void fileCreated(@NotNull VirtualFileEvent event) {
+        incModificationCount();
+      }
+
+      @Override
+      public void beforePropertyChange(@NotNull VirtualFilePropertyEvent event) {
+        incModificationCount();
+      }
+
+      @Override
+      public void beforeContentsChange(@NotNull VirtualFileEvent event) {
+        incModificationCount();
+      }
+
+      @Override
+      public void beforeFileDeletion(@NotNull VirtualFileEvent event) {
+        incModificationCount();
+      }
+
+      @Override
+      public void beforeFileMovement(@NotNull VirtualFileMoveEvent event) {
+        incModificationCount();
+      }
     }, this);
 
     ((EditorEventMulticasterEx)eventMulticaster).addErrorStripeListener(new ErrorStripeHandler(myProject), this);
@@ -614,12 +641,14 @@ public class DaemonListeners implements Disposable {
   }
 
   private void stopDaemon(boolean toRestartAlarm, @NonNls @NotNull String reason) {
+    incModificationCount();
     if (myDaemonCodeAnalyzer.stopProcess(toRestartAlarm, reason)) {
       myDaemonEventPublisher.daemonCancelEventOccurred(reason);
     }
   }
 
   private void stopDaemonAndRestartAllFiles(@NotNull String reason) {
+    incModificationCount();
     if (myDaemonCodeAnalyzer.doRestart()) {
       myDaemonEventPublisher.daemonCancelEventOccurred(reason);
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeHandler.java
index 6467fed6fb63..9cacfdcc2d56 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ErrorStripeHandler.java
@@ -22,10 +22,10 @@ import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
-public class ErrorStripeHandler extends ErrorStripeAdapter {
+class ErrorStripeHandler extends ErrorStripeAdapter {
   private final Project myProject;
 
-  public ErrorStripeHandler(Project project) {
+  ErrorStripeHandler(Project project) {
     myProject = project;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
index 68f779060535..8341d4f61615 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
@@ -16,11 +16,13 @@
 
 package com.intellij.codeInsight.intention.impl;
 
+import com.intellij.codeInsight.daemon.impl.DaemonListeners;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.IntentionActionDelegate;
 import com.intellij.openapi.actionSystem.ShortcutProvider;
 import com.intellij.openapi.actionSystem.ShortcutSet;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.DumbService;
@@ -178,12 +180,19 @@ public class IntentionActionWithTextCaching implements Comparable<IntentionActio
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+      // if anything changed after action executed, mark it invoked.
+      // alternatively, the action could have shown the dialog where user pressed cancel, so do nothing in this case
+      long startModificationCount = DaemonListeners.getInstance(project).getModificationCount();
       try {
         myAction.invoke(project, editor, file);
       }
       finally {
         if (myMarkInvoked != null) {
-          myMarkInvoked.accept(IntentionActionWithTextCaching.this, myAction);
+          ApplicationManager.getApplication().invokeLater(() -> {
+            if (startModificationCount != DaemonListeners.getInstance(project).getModificationCount()) {
+              myMarkInvoked.accept(IntentionActionWithTextCaching.this, myAction);
+            }
+          }, project.getDisposed());
         }
       }
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index 91b14b0c5c80..80a3e1388059 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -63,6 +63,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
   @Nullable
   private final Editor myEditor;
   private final PsiFile myFile;
+  @NotNull
   private final Project myProject;
   private static final TObjectHashingStrategy<IntentionActionWithTextCaching> ACTION_TEXT_AND_CLASS_EQUALS = new TObjectHashingStrategy<IntentionActionWithTextCaching>() {
     @Override
@@ -284,7 +285,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
   }
 
   private void markInvoked(@NotNull IntentionAction action) {
-    if (myEditor != null) {
+    if (myEditor != null && !myEditor.isDisposed() && !myProject.isDisposed()) {
       ShowIntentionsPass.markActionInvoked(myFile.getProject(), myEditor, action);
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/TodoCommentInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/TodoCommentInspection.java
index 0a613995a378..0e370b018e75 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/TodoCommentInspection.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/TodoCommentInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2017 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,35 +15,54 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.ide.todo.TodoIndexPatternProvider;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.search.PsiTodoSearchHelper;
-import com.intellij.psi.search.TodoItem;
+import com.intellij.psi.search.IndexPatternOccurrence;
+import com.intellij.psi.search.searches.IndexPatternSearch;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.SmartList;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class TodoCommentInspection extends LocalInspectionTool {
 
   @Nullable
   @Override
   public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) {
-    final TodoItem[] todoItems = PsiTodoSearchHelper.SERVICE.getInstance(file.getProject()).findTodoItems(file);
+    final List<TextRange> ranges = getTodoRanges(file);
+    if (ranges.isEmpty()) {
+      return null;
+    }
 
-    final List<ProblemDescriptor> result = new ArrayList<>();
+    final List<ProblemDescriptor> result = new SmartList<>();
     final THashSet<PsiComment> comments = new THashSet<>();
-    for (TodoItem todoItem : todoItems) {
-      final PsiComment comment =
-        PsiTreeUtil.getParentOfType(file.findElementAt(todoItem.getTextRange().getStartOffset()), PsiComment.class, false);
+    for (TextRange todoRange : ranges) {
+      final int todoStart = todoRange.getStartOffset();
+      final PsiComment comment = PsiTreeUtil.getParentOfType(file.findElementAt(todoStart), PsiComment.class, false);
       if (comment != null && comments.add(comment)) {
-        result.add(manager.createProblemDescriptor(comment, InspectionsBundle.message("todo.comment.problem.descriptor"), isOnTheFly,
-                                                   null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
+        final int commentStart = comment.getTextOffset();
+        final TextRange range = new TextRange(todoStart - commentStart, todoRange.getEndOffset() - commentStart);
+        result.add(manager.createProblemDescriptor(comment, range, InspectionsBundle.message("todo.comment.problem.descriptor"),
+                                                   ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly));
       }
     }
     return result.toArray(new ProblemDescriptor[result.size()]);
   }
+
+  private static List<TextRange> getTodoRanges(@NotNull PsiFile file) {
+    final TodoIndexPatternProvider todoIndexPatternProvider = TodoIndexPatternProvider.getInstance();
+    assert todoIndexPatternProvider != null;
+    final Collection<IndexPatternOccurrence> occurrences = IndexPatternSearch.search(file, todoIndexPatternProvider).findAll();
+    final List<TextRange> ranges = occurrences.stream().map(o -> o.getTextRange()).collect(Collectors.toList());
+    ranges.sort((a, b) -> Comparing.compare(a.getStartOffset(), b.getStartOffset()));
+    return ranges;
+  }
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
index 752a211b3b0d..75d14f882992 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
@@ -65,8 +65,7 @@ public abstract class InspectionTreeTailRenderer {
       myItemCounter.clear();
       node.visitProblemSeverities(myItemCounter);
       if (myItemCounter.size() > MAX_LEVEL_TYPES) {
-        appendText(InspectionsBundle.message("inspection.problem.descriptor.count", sum(myItemCounter.getValues()) + " ",
-                   SimpleTextAttributes.GRAYED_ATTRIBUTES));
+        appendText(InspectionsBundle.message("inspection.problem.descriptor.count", sum(myItemCounter.getValues()), SimpleTextAttributes.GRAYED_ATTRIBUTES));
       }
       else {
         Object[] levels = myItemCounter.keys();
diff --git a/platform/lang-impl/src/com/intellij/find/SearchTextArea.java b/platform/lang-impl/src/com/intellij/find/SearchTextArea.java
index 6673a3e8c75c..2575387234ee 100644
--- a/platform/lang-impl/src/com/intellij/find/SearchTextArea.java
+++ b/platform/lang-impl/src/com/intellij/find/SearchTextArea.java
@@ -23,6 +23,7 @@ import com.intellij.ide.ui.laf.darcula.DarculaUIUtil;
 import com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI;
 import com.intellij.ide.ui.laf.intellij.MacIntelliJIconCache;
 import com.intellij.ide.ui.laf.intellij.MacIntelliJTextFieldUI;
+import com.intellij.ide.ui.laf.intellij.WinIntelliJTextFieldUI;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.actionSystem.impl.InplaceActionButtonLook;
@@ -59,6 +60,8 @@ import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.PlainDocument;
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.geom.Path2D;
+import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -385,7 +388,8 @@ public class SearchTextArea extends NonOpaquePanel implements PropertyChangeList
 
   @NotNull
   private LafHelper createHelper() {
-    return SystemInfo.isMac && !UIUtil.isUnderDarcula() ? new MacLafHelper() : new DefaultLafHelper();
+    return UIUtil.isUnderWin10LookAndFeel() ? new Win10LafHelper() :
+           SystemInfo.isMac && !UIUtil.isUnderDarcula() ? new MacLafHelper() : new DefaultLafHelper();
   }
 
   private static abstract class LafHelper {
@@ -530,4 +534,82 @@ public class SearchTextArea extends NonOpaquePanel implements PropertyChangeList
       }
     }
   }
+
+  private class Win10LafHelper extends DefaultLafHelper implements Border {
+    private Win10LafHelper() {
+      MouseListener ml = new MouseAdapter() {
+        @Override public void mouseEntered(MouseEvent e) {
+          setHover(true);
+        }
+
+        @Override public void mouseExited(MouseEvent e) {
+          setHover(false);
+        }
+
+        private void setHover(Boolean hover) {
+          putClientProperty(WinIntelliJTextFieldUI.HOVER_PROPERTY, hover);
+          repaint();
+        }
+      };
+
+      myTextArea.addMouseListener(ml);
+      addMouseListener(ml);
+    }
+
+    @Override
+    Border getBorder() {
+      return this;
+    }
+
+    @Override
+    void paint(Graphics2D g) {
+      Rectangle r = new Rectangle(getSize());
+      JBInsets.removeFrom(r, getInsets());
+
+      Graphics2D g2 = (Graphics2D)g.create();
+      try {
+        g2.setColor(myTextArea.getBackground());
+        g2.fill(r);
+      } finally {
+        g2.dispose();
+      }
+    }
+
+    @Override public Insets getBorderInsets(Component c) {
+      return JBUI.insets(1, 0).asUIResource();
+    }
+
+    @Override
+    public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+      Graphics2D g2 = (Graphics2D)g.create();
+      try {
+        Insets i = getInsets();
+        g2.translate(x + i.left, y + i.top);
+        width -= i.left + i.right;
+        height -= i.top + i.bottom;
+
+        if (myTextArea.hasFocus()) {
+          g2.setColor(UIManager.getColor("TextField.focusedBorderColor"));
+        } else if (isEnabled() && getClientProperty(WinIntelliJTextFieldUI.HOVER_PROPERTY) == Boolean.TRUE) {
+          g2.setColor(UIManager.getColor("TextField.hoverBorderColor"));
+        } else {
+          g2.setColor(UIManager.getColor("TextField.borderColor"));
+        }
+
+        int bw = JBUI.scale(1);
+        Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
+        border.append(new Rectangle2D.Double(0, 0, width, height), false);
+        border.append(new Rectangle2D.Double(bw, bw, width - bw*2, height - bw*2), false);
+
+        g2.fill(border);
+      } finally {
+        g2.dispose();
+      }
+    }
+
+    @Override
+    public boolean isBorderOpaque() {
+      return false;
+    }
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index 49eaf66d4cc7..9fbe65170e0e 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -28,8 +28,6 @@ import com.intellij.ide.actions.CopyReferenceAction;
 import com.intellij.ide.actions.GotoFileAction;
 import com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder;
 import com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI;
-import com.intellij.ide.ui.laf.intellij.MacIntelliJTextBorder;
-import com.intellij.ide.ui.laf.intellij.MacIntelliJTextFieldUI;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.MnemonicHelper;
 import com.intellij.openapi.actionSystem.*;
@@ -1135,19 +1133,14 @@ public abstract class ChooseByNameBase {
 
     private MyTextField() {
       super(40);
-      if (!UIUtil.isUnderGTKLookAndFeel()) {
-        if (SystemInfo.isMac && UIUtil.isUnderIntelliJLaF()) {
-          if (!(getUI() instanceof MacIntelliJTextFieldUI)) {
-            setUI(MacIntelliJTextFieldUI.createUI(this));
-          }
-          setBorder(new MacIntelliJTextBorder());
-        } else {
-          if (!(getUI() instanceof DarculaTextFieldUI)) {
-            setUI(DarculaTextFieldUI.createUI(this));
-          }
-          setBorder(new DarculaTextBorder());
+      // Set UI and border for Darcula and all except Win10, Mac and GTK
+      if (!UIUtil.isUnderGTKLookAndFeel() && !UIUtil.isUnderDefaultMacTheme() && !UIUtil.isUnderWin10LookAndFeel()) {
+        if (!(getUI() instanceof DarculaTextFieldUI)) {
+          setUI(DarculaTextFieldUI.createUI(this));
         }
+        setBorder(new DarculaTextBorder());
       }
+
       enableEvents(AWTEvent.KEY_EVENT_MASK);
       myCompletionKeyStroke = getShortcut(IdeActions.ACTION_CODE_COMPLETION);
       forwardStroke = getShortcut(IdeActions.ACTION_GOTO_FORWARD);
diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectDialog.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectDialog.java
index 3387311ca661..911e364d63e0 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectDialog.java
@@ -54,7 +54,7 @@ public abstract class AbstractNewProjectDialog extends DialogWrapper {
     DialogWrapperPeer peer = getPeer();
     JRootPane pane = peer.getRootPane();
     if (pane != null) {
-      JBDimension size = JBUI.size(FlatWelcomeFrame.MAX_DEFAUL_WIDTH, FlatWelcomeFrame.DEFAULT_HEIGHT);
+      JBDimension size = JBUI.size(FlatWelcomeFrame.MAX_DEFAULT_WIDTH, FlatWelcomeFrame.DEFAULT_HEIGHT);
       pane.setMinimumSize(size);
       pane.setPreferredSize(size);
     }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonBorder.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonBorder.java
index dbedc9b47a0e..8e216b7d5028 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonBorder.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonBorder.java
@@ -17,7 +17,10 @@ package com.intellij.ide.ui.laf.intellij;
 
 import com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI;
 import com.intellij.openapi.actionSystem.ActionToolbar;
+import com.intellij.ui.components.panels.Wrapper;
+import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -26,6 +29,7 @@ import java.awt.*;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 
+import static com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI.isSquare;
 import static com.intellij.ide.ui.laf.intellij.WinIntelliJButtonUI.DISABLED_ALPHA_LEVEL;
 
 /**
@@ -43,9 +47,13 @@ public class WinIntelliJButtonBorder implements Border, UIResource {
     Graphics2D g2 = (Graphics2D)g.create();
     AbstractButton b = (AbstractButton)c;
     ButtonModel bm = b.getModel();
-
+    Rectangle r = new Rectangle(x, y, width, height);
     try {
-      g2.translate(x, y);
+      if (isSquare(c)) {
+        JBInsets.removeFrom(r, b.getInsets());
+      }
+
+      g2.translate(r.x, r.y);
       g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
       g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
 
@@ -66,8 +74,8 @@ public class WinIntelliJButtonBorder implements Border, UIResource {
       }
 
       Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
-      border.append(new Rectangle2D.Double(0, 0, width, height), false);
-      border.append(new Rectangle2D.Double(bw, bw, width - 2*bw, height - 2*bw), false);
+      border.append(new Rectangle2D.Double(0, 0, r.width, r.height), false);
+      border.append(new Rectangle2D.Double(bw, bw, r.width - 2*bw, r.height - 2*bw), false);
 
       g2.setColor(color);
       g2.fill(border);
@@ -81,7 +89,8 @@ public class WinIntelliJButtonBorder implements Border, UIResource {
     if (c.getParent() instanceof ActionToolbar) {
       return JBUI.insets(4, 16).asUIResource();
     } else if (DarculaButtonUI.isSquare(c)) {
-      return JBUI.insets(0, 0).asUIResource();
+      int i = (UIUtil.getParentOfType(Wrapper.class, c) != null) ? 1 : 0;
+      return JBUI.insets(i).asUIResource();
     } else if (DarculaButtonUI.isHelpButton((JComponent)c)) {
       return JBUI.insets(0, 0, 0, 10).asUIResource();
     } else {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java
index 7e225222cac9..8fc4317ceb12 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java
@@ -17,6 +17,7 @@ package com.intellij.ide.ui.laf.intellij;
 
 import com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI;
 import com.intellij.util.ui.JBDimension;
+import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.MacUIUtil;
 import sun.swing.SwingUtilities2;
@@ -75,7 +76,17 @@ public class WinIntelliJButtonUI extends DarculaButtonUI {
 
       Graphics2D g2 = (Graphics2D)g.create();
       try {
-        g2.translate(0, 0);
+        Rectangle r = new Rectangle(c.getSize());
+        Container parent = c.getParent();
+        if (c.isOpaque() && parent != null) {
+          g2.setColor(parent.getBackground());
+          g2.fill(r);
+        }
+
+        if (isSquare(c)) { // Count insets for square buttons
+          JBInsets.removeFrom(r, c.getInsets());
+        }
+
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, MacUIUtil.USE_QUARTZ ? RenderingHints.VALUE_STROKE_PURE : RenderingHints.VALUE_STROKE_NORMALIZE);
 
@@ -83,8 +94,8 @@ public class WinIntelliJButtonUI extends DarculaButtonUI {
                       c.hasFocus() || bm.isRollover() ? UIManager.getColor("Button.intellij.native.focusedBackgroundColor") :
                       c.getBackground();
 
-        g.setColor(color);
-        g.fillRect(0, 0, c.getWidth(), c.getHeight());
+        g2.setColor(color);
+        g2.fill(r);
 
         paintContents(g2, b);
       } finally {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java
index 1680d24d28a3..19245d5bfe35 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java
@@ -20,6 +20,7 @@ import com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.EditorTextField;
+import com.intellij.ui.components.panels.Wrapper;
 import com.intellij.util.ui.JBDimension;
 import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
@@ -44,6 +45,7 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
   private static final String HOVER_PROPERTY = "JComboBox.mouseHover";
   private static final String PRESSED_PROPERTY = "JComboBox.mousePressed";
   private static final Border DEFAULT_EDITOR_BORDER = JBUI.Borders.empty(1, 0);
+  private static final int IN_PANEL_OFFSET = 1;
 
   private MouseListener mouseListener;
 
@@ -97,49 +99,48 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
   }
 
   @Override public void paint(Graphics g, JComponent c) {
-    int w = c.getWidth();
-    int h = c.getHeight();
+    Graphics2D g2 = (Graphics2D)g.create();
+    try{
+      Rectangle r = new Rectangle(c.getSize());
 
-    if (c.isOpaque()) {
-      Container parent = c.getParent();
-      if (parent != null) {
-        g.setColor(isTableCellEditor(c) && editor != null ? editor.getBackground() : parent.getBackground());
-        g.fillRect(0, 0, c.getWidth(), c.getHeight());
+      if (c.isOpaque()) {
+        Container parent = c.getParent();
+        if (parent != null) {
+          g2.setColor(isTableCellEditor(c) && editor != null ? editor.getBackground() : parent.getBackground());
+          g2.fill(r);
+        }
       }
-    }
 
-    int bw = JBUI.scale(1);
+      g2.setColor(getComboBackground());
+      resizeInPanel(r);
+      JBInsets.removeFrom(r, JBUI.insets(1));
+      g2.fill(r);
 
-    g.setColor(getComboBackground());
-    g.fillRect(bw, bw, w-2*bw, h-2*bw);
-
-    if (!isTableCellEditor(c)) {
-      paintBorder(c, g, 0, 0, w, h);
-      hasFocus = comboBox.hasFocus();
-    }
-
-    if (!comboBox.isEditable()) {
-      Rectangle r = rectangleForCurrentValue();
-      paintCurrentValue(g, r, hasFocus);
+      if (!comboBox.isEditable()) {
+        hasFocus = comboBox.hasFocus();
+        paintCurrentValue(g, rectangleForCurrentValue(), hasFocus);
+      }
+    } finally {
+      g2.dispose();
     }
   }
 
   @Override protected Rectangle rectangleForCurrentValue() {
-    int width = comboBox.getWidth();
-    int height = comboBox.getHeight();
-    Insets insets = getInsets();
-    int buttonSize = height - (insets.top + insets.bottom);
-    if ( arrowButton != null ) {
+    int w = comboBox.getWidth();
+    int h = comboBox.getHeight();
+    Insets i = getInsets();
+    int buttonSize = h - (i.top + i.bottom);
+    if (arrowButton != null) {
       buttonSize = arrowButton.getWidth();
     }
 
     Rectangle rect = (comboBox.getComponentOrientation().isLeftToRight()) ?
-      new Rectangle(insets.left, insets.top,
-                           width - (insets.left + insets.right + buttonSize),
-                           height - (insets.top + insets.bottom)) :
-      new Rectangle(insets.left + buttonSize, insets.top,
-                           width - (insets.left + insets.right + buttonSize),
-                           height - (insets.top + insets.bottom));
+      new Rectangle(i.left, i.top,
+                           w - (i.left + i.right + buttonSize),
+                           h - (i.top + i.bottom)) :
+      new Rectangle(i.left + buttonSize, i.top,
+                           w - (i.left + i.right + buttonSize),
+                           h - (i.top + i.bottom));
 
     if (editor instanceof JComponent) {
       JBInsets.removeFrom(rect, ((JComponent)editor).getInsets());
@@ -258,7 +259,9 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
     };
 
     button.setOpaque(false);
-    button.setBorder(JBUI.Borders.empty(1, 0, 1, 1));
+
+    int vOffset = inPanel() ? IN_PANEL_OFFSET : 0;
+    button.setBorder(JBUI.Borders.empty(1 + vOffset, 0, 1 + vOffset, 1));
     buttonReleaseListener = new MouseAdapter() {
       @Override
       public void mouseReleased(MouseEvent e) {
@@ -424,13 +427,16 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
       return; //NPE on LaF change
     }
 
+    Rectangle r = new Rectangle(x, y, width, height);
     Graphics2D g2 = (Graphics2D)g.create();
-    try {
-      checkFocus();
-      g2.translate(x, y);
 
+    try {
+      resizeInPanel(r);
+      g2.translate(r.x, r.y);
+
+      checkFocus();
       if (Registry.is("ide.inplace.errors.outline") && comboBox.getClientProperty("JComponent.error.outline") == Boolean.TRUE) {
-        DarculaUIUtil.paintErrorBorder(g2, width, height, 0, true, hasFocus);
+        DarculaUIUtil.paintErrorBorder(g2, r.width, r.height, 0, true, hasFocus);
       } else if (comboBox.isEnabled()) {
         if (comboBox.isEditable()) {
           if (hasFocus) {
@@ -455,14 +461,30 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
 
       int bw = JBUI.scale(1);
       Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
-      border.append(new Rectangle2D.Double(0, 0, width, height), false);
-      border.append(new Rectangle2D.Double(bw, bw, width - bw*2, height - bw*2), false);
+      border.append(new Rectangle2D.Double(0, 0, r.width, r.height), false);
+      border.append(new Rectangle2D.Double(bw, bw, r.width - bw*2, r.height - bw*2), false);
       g2.fill(border);
     } finally {
       g2.dispose();
     }
   }
 
+  private boolean inPanel() {
+    return UIUtil.getParentOfType(Wrapper.class, comboBox) != null;
+  }
+
+  private void resizeInPanel(Rectangle r) {
+    if (inPanel()) {
+      Insets i = comboBox.getInsets();
+      r.y += i.top;
+      r.height -= i.top + i.bottom;
+
+      int offset = JBUI.scale(IN_PANEL_OFFSET);
+      r.x += offset;
+      r.width -= offset;
+    }
+  }
+
   private boolean isHover() {
     return comboBox != null && comboBox.getClientProperty(HOVER_PROPERTY) == Boolean.TRUE ||
            arrowButton != null && arrowButton.getClientProperty(HOVER_PROPERTY) == Boolean.TRUE;
@@ -485,7 +507,10 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI {
 
   @Override
   protected Insets getInsets() {
-    return JBUI.insets(0, 5, 0, 0).asUIResource();
+    boolean inPanel = inPanel();
+    int vOffset = inPanel ? IN_PANEL_OFFSET : 0;
+    int hOffset = 5 + (inPanel ? IN_PANEL_OFFSET : 0);
+    return JBUI.insets(vOffset, hOffset, vOffset, 0).asUIResource();
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java
index cd60aaefba0e..12085fb3c6ec 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java
@@ -27,7 +27,9 @@ import java.awt.*;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 
+import static com.intellij.ide.ui.laf.darcula.ui.TextFieldWithPopupHandlerUI.isSearchFieldWithHistoryPopup;
 import static com.intellij.ide.ui.laf.intellij.WinIntelliJTextFieldUI.HOVER_PROPERTY;
+import static com.intellij.ide.ui.laf.intellij.WinIntelliJTextFieldUI.adjustVerticalInsets;
 
 /**
  * @author Konstantin Bulenkov
@@ -35,32 +37,28 @@ import static com.intellij.ide.ui.laf.intellij.WinIntelliJTextFieldUI.HOVER_PROP
 public class WinIntelliJTextBorder extends DarculaTextBorder {
   @Override
   public Insets getBorderInsets(Component c) {
-
-    int vOffset = TextFieldWithPopupHandlerUI.isSearchField(c) ? 6 : 4;
-    if (TextFieldWithPopupHandlerUI.isSearchFieldWithHistoryPopup(c)) {
-      return JBUI.insets(vOffset, 7 + 16 + 3, vOffset, 7 + 16).asUIResource();
-    }
-    else if (TextFieldWithPopupHandlerUI.isSearchField(c)) {
-      return JBUI.insets(vOffset, 4 + 16 + 3, vOffset, 7 + 16).asUIResource();
-    }
-    else if (c instanceof JTextField && c.getParent() instanceof ColorPanel) {
+    if (isSearchFieldWithHistoryPopup(c)) {
+      return JBUI.insets(3, 26, 3, 23).asUIResource();
+    } else if (TextFieldWithPopupHandlerUI.isSearchField(c)) {
+      return JBUI.insets(3, 20, 3, 23).asUIResource();
+    } else if (c instanceof JTextField && c.getParent() instanceof ColorPanel) {
       return JBUI.insets(3, 3, 2, 2).asUIResource();
-    }
-    else {
+    } else {
       return JBUI.insets(3, 5).asUIResource();
     }
   }
 
   @Override
   public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
-    if (TextFieldWithPopupHandlerUI.isSearchField(c)) return;
-
     Graphics2D g2 = (Graphics2D)g.create();
     try {
-      g2.translate(x, y);
+      Rectangle r = new Rectangle(x, y, width, height);
+      adjustVerticalInsets(r, (JComponent)c);
+
+      g2.translate(r.x, r.y);
       Object eop = ((JComponent)c).getClientProperty("JComponent.error.outline");
       if (Registry.is("ide.inplace.errors.outline") && Boolean.parseBoolean(String.valueOf(eop))) {
-        DarculaUIUtil.paintErrorBorder(g2, width, height, 0, true, c.hasFocus());
+        DarculaUIUtil.paintErrorBorder(g2, r.width, r.height, 0, true, c.hasFocus());
       } else {
         //boolean editable = !(c instanceof JTextComponent) || ((JTextComponent)c).isEditable();
         JComponent jc = (JComponent)c;
@@ -81,8 +79,8 @@ public class WinIntelliJTextBorder extends DarculaTextBorder {
 
         int bw = JBUI.scale(1);
         Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
-        border.append(new Rectangle2D.Double(0, 0, width, height), false);
-        border.append(new Rectangle2D.Double(bw, bw, width - bw*2, height - bw*2), false);
+        border.append(new Rectangle2D.Double(0, 0, r.width, r.height), false);
+        border.append(new Rectangle2D.Double(bw, bw, r.width - bw*2, r.height - bw*2), false);
 
         g2.fill(border);
       }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java
index d26b38b677c4..76195b382c4a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java
@@ -17,6 +17,9 @@ package com.intellij.ide.ui.laf.intellij;
 
 import com.intellij.ide.ui.laf.darcula.DarculaUIUtil;
 import com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.ui.components.panels.Wrapper;
+import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 
@@ -59,8 +62,7 @@ public class WinIntelliJTextFieldUI extends DarculaTextFieldUI {
   @Override
   protected void paintBackground(Graphics g) {
     JTextComponent c = getComponent();
-    if (UIUtil.getParentOfType(JComboBox.class, c) != null ||
-        UIUtil.getParentOfType(JSpinner.class, c) != null) return;
+    if (UIUtil.getParentOfType(JComboBox.class, c) != null) return;
 
     Graphics2D g2 = (Graphics2D)g.create();
     try {
@@ -70,11 +72,9 @@ public class WinIntelliJTextFieldUI extends DarculaTextFieldUI {
         g2.fillRect(0, 0, c.getWidth(), c.getHeight());
       }
 
+      paintTextFieldBackground(c, g2);
       if (isSearchField(c)) {
-        Rectangle r = getDrawingRect();
-        paintSearchField(g2, c, r);
-      } else if (c.getBorder() instanceof WinIntelliJTextBorder){
-        paintTextFieldBackground(c, g2);
+        paintSearchField(g2, c, getDrawingRect());
       }
     } finally {
       g2.dispose();
@@ -82,19 +82,50 @@ public class WinIntelliJTextFieldUI extends DarculaTextFieldUI {
   }
 
   static void paintTextFieldBackground(JComponent c, Graphics2D g2) {
-    g2.setColor(c.isEnabled() ? c.getBackground() : UIManager.getColor("Button.background"));
+    g2.setColor(c.isEnabled() ? c.getBackground() : UIManager.getColor("TextField.inactiveBackground"));
 
     if (!c.isEnabled()) {
       g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.35f));
     }
 
-    int bw = JBUI.scale(1);
-    g2.fillRect(bw, bw, c.getWidth() - bw*2, c.getHeight() - bw*2);
+    Rectangle r = new Rectangle(c.getSize());
+    adjustVerticalInsets(r, c);
+    g2.fill(r);
+  }
+
+  static void adjustVerticalInsets(Rectangle r, JComponent c) {
+    if (UIUtil.getParentOfType(Wrapper.class, c) != null && isSearchFieldWithHistoryPopup(c)) {
+      Insets i = c.getInsets();
+      i.left = i.right = 0;
+      JBInsets.removeFrom(r, i);
+    }
   }
 
   @Override public Dimension getPreferredSize(JComponent c) {
     Dimension size = super.getPreferredSize(c);
-    size.height = isSearchField(c) ? size.height : JBUI.scale(22);
+    size.height = JBUI.scale(22);
     return size;
   }
+
+  @Override protected void paintSearchField(Graphics2D g, JTextComponent c, Rectangle r) {
+    Icon searchIcon = isSearchFieldWithHistoryPopup(c) ?
+                      UIManager.getIcon("TextField.darcula.searchWithHistory.icon") :
+                      UIManager.getIcon("TextField.darcula.search.icon");
+    if (searchIcon == null) {
+      searchIcon = IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/search.png", DarculaTextFieldUI.class, true);
+    }
+
+    int yOffset = isSearchFieldWithHistoryPopup(c) ? JBUI.scale(1) : 0;
+
+    searchIcon.paintIcon(c, g, JBUI.scale(4), (c.getHeight() - searchIcon.getIconHeight()) / 2 + yOffset);
+
+    if (hasText()) {
+      Icon clearIcon = UIManager.getIcon("TextField.darcula.clear.icon");
+      if (clearIcon == null) {
+        clearIcon = IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/clear.png", DarculaTextFieldUI.class, true);
+      }
+      clearIcon.paintIcon(c, g, c.getWidth() - clearIcon.getIconWidth() - JBUI.scale(4),
+                                (c.getHeight() - searchIcon.getIconHeight()) / 2);
+    }
+  }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
index 1729f944b7d8..9676a7952a7a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
@@ -1028,7 +1028,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
         final Object tooltipObject = highlighter.getErrorStripeTooltip();
         if (tooltipObject == null) continue;
 
-        final String text = tooltipObject.toString();
+        final String text = tooltipObject instanceof HighlightInfo ? ((HighlightInfo)tooltipObject).getToolTip() : tooltipObject.toString();
         if (tooltips == null) {
           tooltips = new THashSet<>();
         }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
index 0429052eea32..f54cb4998a98 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
@@ -26,7 +26,7 @@ import com.intellij.util.containers.ConcurrentBitSet;
 import com.intellij.util.containers.ConcurrentIntObjectMap;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.keyFMap.KeyFMap;
-import com.intellij.util.text.CaseInsensitiveCharSequenceHashingStrategy;
+import com.intellij.util.text.CharSequenceHashingStrategy;
 import gnu.trove.THashSet;
 import gnu.trove.TIntHashSet;
 import org.jetbrains.annotations.Contract;
@@ -110,7 +110,7 @@ public class VfsData {
   }
 
   @Nullable
-  public static VirtualFileSystemEntry getFileById(int id, VirtualDirectoryImpl parent) {
+  static VirtualFileSystemEntry getFileById(int id, VirtualDirectoryImpl parent) {
     Segment segment = getSegment(id, false);
     if (segment == null) return null;
 
@@ -300,7 +300,7 @@ public class VfsData {
     }
     void addAdoptedName(CharSequence name, boolean caseSensitive) {
       if (myAdoptedNames == null) {
-        myAdoptedNames = new THashSet<>(0, caseSensitive ? ContainerUtil.canonicalStrategy() : CaseInsensitiveCharSequenceHashingStrategy.INSTANCE);
+        myAdoptedNames = new THashSet<>(0, caseSensitive ? CharSequenceHashingStrategy.CASE_SENSITIVE : CharSequenceHashingStrategy.CASE_INSENSITIVE);
       }
       myAdoptedNames.add(name);
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index 7eef82888ee3..ad805119d262 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileAttributes;
 import com.intellij.openapi.util.io.FileUtilRt;
@@ -27,7 +26,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.InvalidVirtualFileAccessException;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileWithId;
 import com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem;
 import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
 import com.intellij.openapi.vfs.newvfs.NewVirtualFileSystem;
@@ -39,6 +37,7 @@ import com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl;
 import com.intellij.psi.impl.PsiCachedValue;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.UriUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.keyFMap.KeyFMap;
@@ -107,21 +106,6 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
     return result;
   }
 
-  private void removeFromRealAndAddToAdopted(final boolean caseSensitive, @NotNull final String name) {
-    if (myData.isAdoptedName(name)) return; //already added
-    if (!allChildrenLoaded()) {
-      myData.addAdoptedName(name, caseSensitive);
-    }
-
-    int indexInReal = findIndex(myData.myChildrenIds, name, caseSensitive);
-    if (indexInReal >= 0) {
-      // there suddenly can be that we ask to add name to adopted whereas it already contained in the real part
-      // in this case we should remove it from there
-      removeFromArray(indexInReal);
-    }
-    assertConsistency(caseSensitive, name);
-  }
-
   @Nullable // null if there can't be a child with this name, NULL_VIRTUAL_FILE
   private VirtualFileSystemEntry doFindChildInArray(@NotNull String name, boolean caseSensitive) {
     synchronized (myData) {
@@ -216,7 +200,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
   }
 
   @NotNull
-  public VirtualFileSystemEntry createChild(String name, int id, @NotNull NewVirtualFileSystem delegate) {
+  public VirtualFileSystemEntry createChild(@NotNull String name, int id, @NotNull NewVirtualFileSystem delegate) {
     synchronized (myData) {
       return createChild(FileNameCache.storeName(name), id, delegate);
     }
@@ -249,7 +233,6 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
       child.markDirty();
     }
 
-    ((PersistentFSImpl)PersistentFS.getInstance()).incStructuralModificationCount();
     return child;
   }
 
@@ -376,6 +359,15 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
               " is wrongly placed before " +
               verboseToString(VfsData.getFileById(id, this)), getArraySafely(), details);
       }
+      if (myData.isAdoptedName(name)) {
+        try {
+          error("In "+verboseToString(this)+" file '"+name+"' is both child and adopted",
+                getArraySafely(), "Adopted: "+myData.getAdoptedNames()+";\n "+details);
+        }
+        finally {
+          myData.removeAdoptedName(name);
+        }
+      }
     }
   }
 
@@ -394,10 +386,9 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
   }
 
   private static void error(String message, VirtualFileSystemEntry[] array, Object... details) {
-    String children = StringUtil.join(array, VirtualDirectoryImpl::verboseToString, ",");
-    throw new AssertionError(
-      message + "; children: " + children + "\nDetails: " + ContainerUtil.map(
-        details, o -> o instanceof Object[] ? Arrays.toString((Object[])o) : o));
+    String children = StringUtil.join(array, VirtualDirectoryImpl::verboseToString, "\n");
+    String detailsStr = StringUtil.join(ContainerUtil.<Object, Object>map(details, o -> o instanceof Object[] ? Arrays.toString((Object[])o) : o), "\n");
+    throw new AssertionError(message + "; children: " + children + "\nDetails: " + detailsStr);
   }
 
   @Override
@@ -422,39 +413,55 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
     throw new IOException("Cannot get content of directory: " + this);
   }
 
+  public static class IdNamePair {
+    private final int id;
+    private final CharSequence name;
+
+    public IdNamePair(int id, @NotNull CharSequence name) {
+      this.id = id;
+      this.name = name;
+    }
+
+    @Override
+    public String toString() {
+      return '(' + id + ", '" + name + "')";
+    }
+  }
   // optimisation: works faster than added.forEach(this::addChild)
-  public void addChildren(@NotNull List<Pair<VirtualFile,CharSequence>> added) {
-    if (added.size()<=3) {
-      //noinspection ForLoopReplaceableByForEach
-      for (int i = 0; i < added.size(); i++) {
-        VirtualFile file = added.get(i).getFirst();
-        addChild((VirtualFileSystemEntry)file);
+  public void createAndAddChildren(@NotNull List<IdNamePair> added) {
+    if (added.size()<=1) {
+      for (IdNamePair pair : added) {
+        VirtualFileSystemEntry file = createChild(pair.name.toString(), pair.id, getFileSystem());
+        addChild(file);
       }
       return;
     }
 
     // merge sorted added and existing lists just like in merge sort
     final boolean caseSensitive = getFileSystem().isCaseSensitive();
-    Comparator<Pair<VirtualFile, CharSequence>> pairComparator = (p1, p2) -> compareNames(p1.getSecond(), p2.getSecond(), caseSensitive);
+    Comparator<IdNamePair> pairComparator = (p1, p2) -> compareNames(p1.name, p2.name, caseSensitive);
     added.sort(pairComparator);
     TIntArrayList mergedIds = new TIntArrayList(myData.myChildrenIds.length + added.size());
     synchronized (myData) {
-      ContainerUtil.processSortedListsInOrder(added, new AbstractList<Pair<VirtualFile,CharSequence>>() {
+      for (IdNamePair pair : added) {
+        createChild(pair.name.toString(), pair.id, getFileSystem());
+        myData.removeAdoptedName(pair.name);
+      }
+      ContainerUtil.processSortedListsInOrder(added, new AbstractList<IdNamePair>() {
         @Override
-        public Pair<VirtualFile,CharSequence> get(int index) {
-          VirtualFileSystemEntry file = VfsData.getFileById(myData.myChildrenIds[index], VirtualDirectoryImpl.this);
-          return Pair.create(file, file.getNameSequence());
+        public IdNamePair get(int index) {
+          int id = myData.myChildrenIds[index];
+          CharSequence name = ObjectUtils.assertNotNull(VfsData.getNameByFileId(id));
+          return new IdNamePair(id, name);
         }
 
         @Override
         public int size() {
           return myData.myChildrenIds.length;
         }
-      }, pairComparator, true, pair -> {
-        mergedIds.add(((VirtualFileWithId)pair.getFirst()).getId());
-        return true;
-      });
+      }, pairComparator, true, pair -> mergedIds.add(pair.id));
       myData.myChildrenIds = mergedIds.toNativeArray();
+
       ((PersistentFSImpl)PersistentFS.getInstance()).incStructuralModificationCount();
       assertConsistency(caseSensitive, added);
     }
@@ -491,76 +498,50 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
     boolean caseSensitive = getFileSystem().isCaseSensitive();
     String name = file.getName();
     synchronized (myData) {
-      removeFromRealAndAddToAdopted(caseSensitive, name);
+      int indexInReal = findIndex(myData.myChildrenIds, name, caseSensitive);
+      if (indexInReal >= 0) {
+        // there suddenly can be that we ask to add name to adopted whereas it already contained in the real part
+        // in this case we should remove it from there
+        removeFromArray(indexInReal);
+      }
+      if (!allChildrenLoaded()) {
+        myData.addAdoptedName(name, caseSensitive);
+      }
+
       assertConsistency(caseSensitive, file);
     }
   }
 
   // faster than names.forEach(this::removeChild)
-  public void removeChildren(@NotNull List<CharSequence> names) {
+  public void removeChildren(@NotNull TIntHashSet idsToRemove, @NotNull List<CharSequence> namesToRemove) {
     boolean caseSensitive = getFileSystem().isCaseSensitive();
     synchronized (myData) {
-      Comparator<CharSequence> comparator = (n1, n2) -> compareNames(n1, n2, caseSensitive);
-      names.sort(comparator);
-
       boolean allChildrenLoaded = allChildrenLoaded();
       if (!allChildrenLoaded) {
-        for (CharSequence name : names) {
+        for (CharSequence name : namesToRemove) {
           myData.addAdoptedName(name, caseSensitive);
         }
       }
 
       // remove from array by merging two sorted lists
       int[] newIds = new int[myData.myChildrenIds.length];
-      int length = processSortedListsAndRemoveFirstFromTheSecond(names, myData.myChildrenIds, comparator, newIds);
-      if (length != newIds.length) {
-        newIds = length == 0 ? ArrayUtil.EMPTY_INT_ARRAY : Arrays.copyOf(newIds, length);
+      int[] oldIds = myData.myChildrenIds;
+      int o = 0;
+      for (int oldId : oldIds) {
+        if (!idsToRemove.contains(oldId)) {
+          newIds[o++] = oldId;
+        }
+      }
+      if (o != newIds.length) {
+        newIds = o == 0 ? ArrayUtil.EMPTY_INT_ARRAY : Arrays.copyOf(newIds, o);
       }
       myData.myChildrenIds = newIds;
       ((PersistentFSImpl)PersistentFS.getInstance()).incStructuralModificationCount();
 
-      assertConsistency(caseSensitive, names);
+      assertConsistency(caseSensitive, namesToRemove);
     }
   }
 
-  // returns output length
-  private static int processSortedListsAndRemoveFirstFromTheSecond(@NotNull List<CharSequence> namesToRemove,
-                                                                   @NotNull int[] ids,
-                                                                   @NotNull Comparator<CharSequence> comparator,
-                                                                   @NotNull int[] output) {
-    int index1 = 0;
-    int index2 = 0;
-    int o = 0;
-    while (index2 < ids.length) {
-      int e;
-      if (index1 >= namesToRemove.size()) {
-        e = ids[index2++];
-      }
-      else {
-        CharSequence nameToRemove = namesToRemove.get(index1);
-        int id = ids[index2];
-        CharSequence element2 = VfsData.getNameByFileId(id);
-        int c = comparator.compare(nameToRemove, element2);
-        if (c == 0) {
-          // remove
-          index2++;
-          continue;
-        }
-        if (c < 0) {
-          // next name to remove
-          index1++;
-          continue;
-        }
-        e = id;
-        index2++;
-      }
-      output[o++] = e;
-    }
-
-    return o;
-  }
-
-
   private void removeFromArray(int index) {
     myData.myChildrenIds = ArrayUtil.remove(myData.myChildrenIds, index);
     ((PersistentFSImpl)PersistentFS.getInstance()).incStructuralModificationCount();
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
index def677039346..412adeb9ce08 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
@@ -19,6 +19,7 @@
  */
 package com.intellij.openapi.vfs.newvfs.impl;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.ApplicationUtil;
 import com.intellij.openapi.application.impl.ApplicationImpl;
@@ -52,7 +53,7 @@ import java.util.Collection;
 import java.util.Collections;
 
 public class VirtualFileImpl extends VirtualFileSystemEntry {
-
+  @VisibleForTesting
   public VirtualFileImpl(int id, VfsData.Segment segment, VirtualDirectoryImpl parent) {
     super(id, segment, parent);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
index 72eddda997c1..4494897d15d3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.LowMemoryWatcher;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.ShutDownTracker;
 import com.intellij.openapi.util.io.*;
 import com.intellij.openapi.util.text.StringUtil;
@@ -779,9 +778,10 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
     parentChildrenIds.addAll(oldIds);
     boolean hasRemovedChildren = false;
 
-    List<Pair<VirtualFile,CharSequence>> childrenAdded = new SmartList<>();
+    List<VirtualDirectoryImpl.IdNamePair> childrenAdded = new SmartList<>();
     List<VirtualFile> childrenDeleted = new SmartList<>();
     List<CharSequence> childrenNamesDeleted = new SmartList<>();
+    TIntHashSet childrenIdsDeleted = new TIntHashSet(Math.max(events.size(), oldIds.length));
     for (VFileEvent event : events) {
       if (event instanceof VFileCreateEvent) {
         String name = ((VFileCreateEvent)event).getChildName();
@@ -791,9 +791,8 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
         if (attributes != null) {
           final int childId = createAndFillRecord(delegate, fake, parentId, attributes);
           assert parent instanceof VirtualDirectoryImpl : parent;
-          final VirtualDirectoryImpl dir = (VirtualDirectoryImpl)parent;
-          VirtualFileSystemEntry child = dir.createChild(name, childId, dir.getFileSystem());
-          childrenAdded.add(Pair.create(child, name));
+
+          childrenAdded.add(new VirtualDirectoryImpl.IdNamePair(childId, name));
           parentChildrenIds.add(childId);
         }
       }
@@ -809,6 +808,7 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
 
         childrenDeleted.add(file);
         childrenNamesDeleted.add(file.getNameSequence());
+        childrenIdsDeleted.add(id);
         parentChildrenIds.remove(id);
       }
     }
@@ -823,10 +823,10 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
         FSRecords.deleteRecordRecursively(getFileId(childFile));
         invalidateSubtree(childFile);
       }
-      parentImpl.removeChildren(childrenNamesDeleted);
+      parentImpl.removeChildren(childrenIdsDeleted, childrenNamesDeleted);
     }
     if (!childrenAdded.isEmpty()) {
-      parentImpl.addChildren(childrenAdded);
+      parentImpl.createAndAddChildren(childrenAdded);
     }
   }
 
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 ae2b2d2a848d..d17e0a09a9a2 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
@@ -88,7 +88,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
   public static final String BOTTOM_PANEL = "BOTTOM_PANEL";
   private static final String ACTION_GROUP_KEY = "ACTION_GROUP_KEY";
   public static final int DEFAULT_HEIGHT = 460;
-  public static final int MAX_DEFAUL_WIDTH = 777;
+  public static final int MAX_DEFAULT_WIDTH = 777;
   private BalloonLayout myBalloonLayout;
   private final FlatWelcomeScreen myScreen;
   private boolean myDisposed;
@@ -111,7 +111,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
     setContentPane(myScreen.getWelcomePanel());
     setTitle(getWelcomeFrameTitle());
     AppUIUtil.updateWindowIcon(this);
-    final int width = RecentProjectsManager.getInstance().getRecentProjectsActions(false).length == 0 ? 666 : MAX_DEFAUL_WIDTH;
+    final int width = RecentProjectsManager.getInstance().getRecentProjectsActions(false).length == 0 ? 666 : MAX_DEFAULT_WIDTH;
     getRootPane().setPreferredSize(JBUI.size(width, DEFAULT_HEIGHT));
     setResizable(false);
 
diff --git a/platform/platform-impl/src/com/intellij/ui/FontComboBox.java b/platform/platform-impl/src/com/intellij/ui/FontComboBox.java
index 9d82923d1f55..147b59834cd2 100644
--- a/platform/platform-impl/src/com/intellij/ui/FontComboBox.java
+++ b/platform/platform-impl/src/com/intellij/ui/FontComboBox.java
@@ -90,14 +90,14 @@ public final class FontComboBox extends ComboBox {
   }
 
   private static final class Model extends AbstractListModel implements ComboBoxModel {
-    private final NoFontItem NO_FONT_ITEM;
+    private final NoFontItem myNoFontItem;
     private volatile List<FontInfo> myAllFonts = Collections.emptyList();
     private volatile List<FontInfo> myMonoFonts = Collections.emptyList();
     private boolean myMonospacedOnly;
     private Object mySelectedItem;
 
     private Model(boolean withAllStyles, boolean filterNonLatin, boolean noFontItem) {
-      NO_FONT_ITEM = noFontItem ? new NoFontItem() : null;
+      myNoFontItem = noFontItem ? new NoFontItem() : null;
       Application application = ApplicationManager.getApplication();
       if (application == null || application.isUnitTestMode()) {
         setFonts(FontInfo.getAll(withAllStyles), filterNonLatin);
@@ -141,8 +141,8 @@ public final class FontComboBox extends ComboBox {
 
     @Override
     public void setSelectedItem(@Nullable Object item) {
-      if (item == null && NO_FONT_ITEM != null) {
-        item = NO_FONT_ITEM;
+      if (item == null && myNoFontItem != null) {
+        item = myNoFontItem;
       }
       else {
         if (item instanceof FontInfo) {
@@ -164,7 +164,7 @@ public final class FontComboBox extends ComboBox {
     }
 
     public boolean isNoFontSelected() {
-      return getSelectedItem() == NO_FONT_ITEM;
+      return getSelectedItem() == myNoFontItem;
     }
 
     @Override
@@ -172,15 +172,15 @@ public final class FontComboBox extends ComboBox {
       List<FontInfo> list = myMonospacedOnly ? myMonoFonts : myAllFonts;
       int size = list.size();
       if (mySelectedItem instanceof String)  size ++;
-      if (NO_FONT_ITEM != null) size++;
+      if (myNoFontItem != null) size++;
       return size;
     }
 
     @Override
     public Object getElementAt(int index) {
       int i = index;
-      if (NO_FONT_ITEM != null) {
-        if (index == 0) return NO_FONT_ITEM;
+      if (myNoFontItem != null) {
+        if (index == 0) return myNoFontItem;
         i --;
       }
       List<FontInfo> list = myMonospacedOnly ? myMonoFonts : myAllFonts;
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 30302cda656e..23d16199528e 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -1248,7 +1248,7 @@ action.ChangesView.NewChangeList.text=New Changelist
 action.ChangesView.NewChangeList.description=Create new changelist
 action.ChangesView.Revert.text=_Revert
 action.ChangesView.Revert.description=Revert selected changes
-action.ChangesView.RemoveChangeList.text=Delete Changelists
+action.ChangesView.RemoveChangeList.text=Delete {0,choice,0#Changelist|1#Changelists}
 action.ChangesView.RemoveChangeList.description=Remove changelists and move all changes to {0}
 action.ChangesView.SetDefault.text=Set Active Changelist
 action.ChangesView.SetDefault.description=Set changelist to which new changes are placed by default
@@ -1286,6 +1286,8 @@ action.ChangesView.Ignore.text=Ignore...
 action.ChangesView.Ignore.description=Do not show selected files as unversioned
 action.ChangesView.CreatePatchFromChanges.text=Create Patch...
 action.ChangesView.CreatePatchFromChanges.description=Create a patch from the selected changes
+action.ChangesView.CreatePatchToClipboard.text=Copy as Patch to Clipboard
+action.ChangesView.CreatePatchToClipboard.description=Create patch from changes and copy it to clipboard
 action.CommittedChanges.Refresh.text=Refresh
 action.CommittedChanges.Refresh.description=Refresh the list of committed changes
 action.CommittedChanges.Filter.text=Filter
diff --git a/platform/platform-resources-en/src/messages/UsageView.properties b/platform/platform-resources-en/src/messages/UsageView.properties
index 9ee8d9e2172e..6b042964e119 100644
--- a/platform/platform-resources-en/src/messages/UsageView.properties
+++ b/platform/platform-resources-en/src/messages/UsageView.properties
@@ -23,8 +23,6 @@ action.next.occurrence=Next Occurrence
 action.previous.occurrence=Previous Occurrence
 progress.searching.for.in=Searching for {0} in {1}{2}...
 dialog.no.usages.found.in=No {0} found in {1}{2}
-dialog.title.information=Information
-dialog.button.ok=OK
 node.invalid=INVALID
 node.readonly=Read-only
 node.group.module=Module:
diff --git a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
index 3db7df70ec68..ef03e419240c 100644
--- a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
@@ -80,7 +80,9 @@
 
     <extensionPoint name="openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider"
                     interface="com.intellij.openapi.actionSystem.AnActionExtensionProvider"/>
-    <extensionPoint name="openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider"
+    <extensionPoint name="openapi.vcs.changes.actions.CreatePatchFromChangesAction.Dialog.ExtensionProvider"
+                    interface="com.intellij.openapi.actionSystem.AnActionExtensionProvider"/>
+    <extensionPoint name="openapi.vcs.changes.actions.CreatePatchFromChangesAction.Clipboard.ExtensionProvider"
                     interface="com.intellij.openapi.actionSystem.AnActionExtensionProvider"/>
   </extensionPoints>
 </idea-plugin>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index e84937974541..5f42745d5c8f 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -223,7 +223,9 @@
     <group id="Diff.EditorPopupMenu"/>
     <group id="Diff.ViewerPopupMenu"/>
     <group id="Diff.ViewerToolbar"/>
-    <group id="Diff.EditorGutterPopupMenu"/>
+    <group id="Diff.EditorGutterPopupMenu">
+      <group id="Diff.EditorGutterPopupMenu.EditorSettings"/>
+    </group>
 
     <action id="ScrollTreeToCenter" text="Scroll to Center" class="com.intellij.ide.actions.ScrollTreeToCenterAction" use-shortcut-of="EditorScrollToCenter"/>
 
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index b326694e9511..263b9bf245f4 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -12,10 +12,9 @@
     <action id="UpdateFiles" class="com.intellij.openapi.vcs.update.CommonUpdateFileOrDirectoryAction"/>
     <action id="CheckStatusForFiles" class="com.intellij.openapi.vcs.update.CommonStatusFileOrDirectoryAction"/>
     <action id="IntegrateFiles" class="com.intellij.openapi.vcs.update.CommonIntegrateFileOrDirectoryAction"/>
-    <action id="Annotate" class="com.intellij.openapi.vcs.actions.AnnotateToggleAction"/>
-    <action id="AnnotateDiffViewer" class="com.intellij.openapi.vcs.actions.AnnotateDiffViewerAction" use-shortcut-of="Annotate">
+    <action id="Annotate" class="com.intellij.openapi.vcs.actions.AnnotateToggleAction">
       <add-to-group group-id="Diff.EditorPopupMenu"/>
-      <add-to-group group-id="Diff.EditorGutterPopupMenu"/>
+      <add-to-group group-id="Diff.EditorGutterPopupMenu" anchor="first"/>
     </action>
     <action id="Show.Current.Revision" class="com.intellij.openapi.vcs.actions.ShowBaseRevisionAction" text="Show Current Revision"/>
     <action id="Compare.SameVersion" class="com.intellij.openapi.vcs.actions.CompareWithTheSameVersionAction" icon="AllIcons.Actions.Diff"/>
@@ -127,7 +126,7 @@
       <reference ref="ChangesView.SetDefault"/>
       <action id="ChangesView.Rename" class="com.intellij.openapi.vcs.changes.actions.RenameChangeListAction"/>
       <reference ref="ChangesView.CreatePatch"/>
-      <action id="ChangesView.CreatePatchToClipboard" class="com.intellij.openapi.vcs.changes.patch.CreatePatchToClipboardAction"/>
+      <action id="ChangesView.CreatePatchToClipboard" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction$Clipboard"/>
       <reference ref="ChangesView.Shelve"/>
       <separator/>
       <reference ref="ChangesView.Refresh"/>
@@ -150,7 +149,7 @@
       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
       <reference id="Diff.ShowDiff"/>
       <reference id="Vcs.ShowDiffWithLocal"/>
-      <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction"
+      <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction$Dialog"
               icon="AllIcons.Vcs.Patch"/>
       <action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>
       <separator/>
diff --git a/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java b/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
index 46bfcb13d0a5..979d10925cbf 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
@@ -51,8 +51,8 @@ public class BadPluginTest extends PlatformTestCase {
     FileUtil.copyDir(new File(path), directory);
 
     System.setProperty(PathManager.PROPERTY_CONFIG_PATH, directory.getPath());
-    System.out.println("Old path: " + myOldConfigPath);
-    System.out.println("New path: " + System.getProperty(PathManager.PROPERTY_CONFIG_PATH));
+    LOG.debug("Old path: " + myOldConfigPath);
+    LOG.debug("New path: " + System.getProperty(PathManager.PROPERTY_CONFIG_PATH));
     super.setUp();
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
index 7c8fb123c960..c6530b5b47b6 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
@@ -31,7 +31,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class IdeEventQueueTest extends PlatformTestCase {
-  public void testManyEvents() {
+  public void testManyEventsStress() {
     int N = 100000;
     PlatformTestUtil.startPerformanceTest("Event queue dispatch", 10000, () -> {
       UIUtil.dispatchAllInvocationEvents();
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/actions/ActionsWithoutUpdateMethodTest.java b/platform/platform-tests/testSrc/com/intellij/ide/actions/ActionsWithoutUpdateMethodTest.java
index 700af658b02c..4edf81fffbd6 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/actions/ActionsWithoutUpdateMethodTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/actions/ActionsWithoutUpdateMethodTest.java
@@ -57,7 +57,7 @@ public class ActionsWithoutUpdateMethodTest extends PlatformTestCase {
     for (String id : ids) {
       AnAction action = mgr.getAction(id);
       if (action == null) {
-        System.out.println("Can't find action: " + id);
+        fail("Can't find action: " + id);
         continue;
       }
       Method updateMethod = action.getClass().getMethod("update", AnActionEvent.class);
@@ -66,7 +66,7 @@ public class ActionsWithoutUpdateMethodTest extends PlatformTestCase {
       }
     }
     for (AnAction action : failed) {
-      System.out.println(action + " ID: " + mgr.getId(action) + " Class: " + action.getClass());
+      System.err.println(action + " ID: " + mgr.getId(action) + " Class: " + action.getClass());
     }
 
     assertEmpty("The following actions have shortcuts, but don't have update() method redefined", failed);
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
index 824068d0cf40..fc61670666c3 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
@@ -81,9 +81,9 @@ public class BookmarkManagerTest extends AbstractEditorTest {
   
   public void testBookmarkLineRemove() throws IOException {
     List<ComponentAdapter> adapters = getProject().getPicoContainer().getComponentAdaptersOfType(ChangeListManagerImpl.class);
-    System.out.println(adapters.size() + " adapters:");
+    LOG.debug(adapters.size() + " adapters:");
     for (ComponentAdapter adapter : adapters) {
-      System.out.println(adapter);
+      LOG.debug(String.valueOf(adapter));
     }
 
     @NonNls String text =
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
index 12616234a068..311ce72ad018 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
@@ -95,7 +95,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
           assertFalse(application.isReadAccessAllowed());
           int ratioPercent = (int)((l1 - l2) * 100.0 / l1);
           String msg = "acquireReadActionLock(" + l2 + "ms) vs runReadAction(" + l1 + "ms). Ratio: " + ratioPercent + "% (in "+(ratioPercent<0 ? "my" : "Maxim's") +" favor)";
-          System.out.println(msg + "\nAcquire:\n" + dataAcq.getSummary(" ") + "\nRun:\n" + dataRun.getSummary(" "));
+          LOG.debug(msg + "\nAcquire:\n" + dataAcq.getSummary(" ") + "\nRun:\n" + dataRun.getSummary(" "));
           if (Math.abs(ratioPercent) > 40) {
             return "Suspiciously different times for " + msg;
           }
@@ -137,7 +137,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     application.disableEventsUntil(disposable);
 
     try {
-      PlatformTestUtil.startPerformanceTest("lock performance", expectedMs, () -> {
+      PlatformTestUtil.startPerformanceTest("lock/unlock", expectedMs, () -> {
         final int numOfThreads = JobSchedulerImpl.CORES_COUNT;
         List<Thread> threads = new ArrayList<>(numOfThreads);
         for (int i = 0; i < numOfThreads; i++) {
@@ -184,7 +184,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     // try to take read lock2 - must wait (because of write preference - write lock is pending)
     // release read lock1 - write lock must be taken first
     // release write - read lock2 must be taken
-    System.out.println("-----");
+    LOG.debug("-----");
     ApplicationImpl application = (ApplicationImpl)ApplicationManager.getApplication();
     AtomicBoolean holdRead1 = new AtomicBoolean(true);
     AtomicBoolean holdWrite = new AtomicBoolean(true);
@@ -199,14 +199,14 @@ public class ApplicationImplTest extends LightPlatformTestCase {
         assertFalse(ApplicationManager.getApplication().isDispatchThread());
         AccessToken stamp = application.acquireReadActionLock();
         try {
-          System.out.println("read lock1 acquired");
+          LOG.debug("read lock1 acquired");
           read1Acquired.set(true);
           while (holdRead1.get() && ok());
         }
         finally {
           read1Released.set(true);
           stamp.finish();
-          System.out.println("read lock1 released");
+          LOG.debug("read lock1 released");
         }
       }
       catch (Throwable e) {
@@ -226,13 +226,13 @@ public class ApplicationImplTest extends LightPlatformTestCase {
         TimeoutUtil.sleep(1000); // make sure it called writelock
         AccessToken stamp = application.acquireReadActionLock();
         try {
-          System.out.println("read lock2 acquired");
+          LOG.debug("read lock2 acquired");
           read2Acquired.set(true);
         }
         finally {
           read2Released.set(true);
           stamp.finish();
-          System.out.println("read lock2 released");
+          LOG.debug("read lock2 released");
         }
       }
       catch (Throwable e) {
@@ -313,7 +313,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     aboutToAcquireWrite.set(true);
     AccessToken stamp = application.acquireWriteActionLock(getClass());
     try {
-      System.out.println("write lock acquired");
+      LOG.debug("write lock acquired");
       writeAcquired.set(true);
 
       while (holdWrite.get() && ok()) {
@@ -325,7 +325,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     finally {
       writeReleased.set(true);
       stamp.finish();
-      System.out.println("write lock released");
+      LOG.debug("write lock released");
     }
 
     readAction1.join();
@@ -511,7 +511,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     }
     //System.out.println("warming finished");
     final int readIterations = 100000000;
-    PlatformTestUtil.startPerformanceTest("RWLock is slow", 12000, ()-> {
+    PlatformTestUtil.startPerformanceTest("RWLock/unlock", 12000, ()-> {
       ReadMostlyRWLock lock = new ReadMostlyRWLock(Thread.currentThread());
 
       final int numOfThreads = JobSchedulerImpl.CORES_COUNT;
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
index a079e88c6e8a..f7bcc63432b3 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
@@ -26,7 +26,7 @@ public class EditorCreationPerformanceTest extends AbstractEditorTest {
     PlatformTestUtil.startPerformanceTest("Editor creation", 750, () -> {
       Editor editor = EditorFactory.getInstance().createEditor(document);
       try {
-        System.out.println(editor.getContentComponent().getPreferredSize());
+        LOG.debug(String.valueOf(editor.getContentComponent().getPreferredSize()));
       }
       finally {
         EditorFactory.getInstance().releaseEditor(editor);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
index de46397776d0..47a2eff5107c 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
@@ -51,6 +51,6 @@ public class EditorPaintingPerformanceTest extends AbstractEditorTest {
         result[0] += g.getResult();
       }
     }).assertTiming();
-    System.out.println(result[0]);
+    LOG.debug(String.valueOf(result[0]));
   }
 }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
index 3e2d8d53f031..b6e5de43879d 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
@@ -58,7 +58,7 @@ public class EditorStressTest extends AbstractEditorTest {
   private long mySeed;
 
   public void testRandomActions() {
-    System.out.println("Seed is " + mySeed);
+    LOG.debug("Seed is " + mySeed);
     int i = 0;
     try {
       initText("");
@@ -72,7 +72,7 @@ public class EditorStressTest extends AbstractEditorTest {
     }
     catch (Throwable t) {
       String message = "Failed when run with seed=" + mySeed + " in iteration " + i;
-      System.out.println(message);
+      System.err.println(message);
       throw new RuntimeException(message, t);
     }
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
index 7ff17dc68b0d..5fa0195313cf 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
@@ -287,7 +287,7 @@ public class VfsUtilPerformanceTest extends BareTestFixtureTestCase {
   }
 
   @Test
-  public void addingManyChildrenToTheSameDirectoryMustNotBeQuadratic() throws IOException {
+  public void addingManyChildrenToTheSameDirectoryMustNotBeQuadratic() throws Exception {
     int N = 1_000_000;
     // measures create N children inside one directory.
     // to avoid slow local file system try to use MyFakeVirtualFile which doesn't actually query disk
@@ -296,21 +296,19 @@ public class VfsUtilPerformanceTest extends BareTestFixtureTestCase {
     Disposer.register(getTestRootDisposable(), ()-> ApplicationInfoImpl.setInStressTest(false));
     List<VirtualFile> toDelete = new ArrayList<>();
     try {
-      UIUtil.invokeLaterIfNeeded(()->{
-        PlatformTestUtil.startPerformanceTest("adding many children", 15000, () -> {
-          VirtualFile validVTemp = new MyFakeDirectory("vtemp");
-          toDelete.add(validVTemp);
-          List<VFileEvent> events = IntStream.range(0, N)
-            .mapToObj(i -> new VFileCreateEvent(this, validVTemp, i + ".txt", false, false))
-            .collect(Collectors.toList());
+      UIUtil.invokeAndWaitIfNeeded((Runnable)()-> PlatformTestUtil.startPerformanceTest("adding many children", 15000, () -> {
+        VirtualFile validVTemp = new MyFakeDirectory("vtemp");
+        toDelete.add(validVTemp);
+        List<VFileEvent> events = IntStream.range(0, N)
+          .mapToObj(i -> new VFileCreateEvent(this, validVTemp, i + ".txt", false, false))
+          .collect(Collectors.toList());
 
-          WriteCommandAction.runWriteCommandAction(null, () -> {
-            PersistentFS.getInstance().processEvents(events);
-          });
+        WriteCommandAction.runWriteCommandAction(null, () -> {
+          PersistentFS.getInstance().processEvents(events);
+        });
 
-          assertEquals(N, validVTemp.getChildren().length);
-        }).assertTiming();
-      });
+        assertEquals(N, validVTemp.getChildren().length);
+      }).assertTiming());
     }
     finally {
       toDelete.forEach(VfsTestUtil::deleteFile);
@@ -328,7 +326,7 @@ public class VfsUtilPerformanceTest extends BareTestFixtureTestCase {
     Disposer.register(getTestRootDisposable(), ()-> ApplicationInfoImpl.setInStressTest(false));
     List<VirtualFile> toDelete = new ArrayList<>();
     try {
-      UIUtil.invokeLaterIfNeeded(()->{
+      UIUtil.invokeAndWaitIfNeeded((Runnable)()->{
         final VirtualDirectoryImpl[] validVTemp = new VirtualDirectoryImpl[1];
         List<VFileEvent> deleteEvents = new ArrayList<>();
         PlatformTestUtil.startPerformanceTest("deleting many children", 30000, () -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
index 98198d4d373f..986f3753df1a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
@@ -118,37 +118,37 @@ public class FileEncodingTest extends PlatformTestCase implements TestDialog {
     String text = getDocument(xml).getText();
 
     if (!expected.equals(text)) {
-      System.out.print("expected = ");
+      System.err.print("expected = ");
       for (int i=0; i<50;i++) {
         final char c = expected.charAt(i);
-        System.out.print(Integer.toHexString((int)c)+", ");
+        System.err.print(Integer.toHexString((int)c)+", ");
       }
-      System.out.println("");
-      System.out.print("expected bytes = ");
+      System.err.println("");
+      System.err.print("expected bytes = ");
       byte[] expectedBytes = FileUtil.loadFileBytes(new File(xml.getPath()));
       for (int i=0; i<50;i++) {
         final byte c = expectedBytes[i];
-        System.out.print(Integer.toHexString((int)c) + ", ");
+        System.err.print(Integer.toHexString((int)c) + ", ");
       }
-      System.out.println("");
+      System.err.println("");
 
-      System.out.print("text = ");
+      System.err.print("text = ");
       for (int i=0; i<50;i++) {
         final char c = text.charAt(i);
-        System.out.print(Integer.toHexString((int)c)+", ");
+        System.err.print(Integer.toHexString((int)c)+", ");
       }
-      System.out.println("");
-      System.out.print("text bytes = ");
+      System.err.println("");
+      System.err.print("text bytes = ");
       byte[] textBytes = xml.contentsToByteArray();
       for (int i=0; i<50;i++) {
         final byte c = textBytes[i];
-        System.out.print(Integer.toHexString((int)c) + ", ");
+        System.err.print(Integer.toHexString((int)c) + ", ");
       }
-      System.out.println("");
+      System.err.println("");
       String charsetFromProlog = XmlCharsetDetector.extractXmlEncodingFromProlog(xml.contentsToByteArray());
-      System.out.println("charsetFromProlog = " + charsetFromProlog);
+      System.err.println("charsetFromProlog = " + charsetFromProlog);
       Charset charset = xml.getCharset();
-      System.out.println("charset = " + charset);
+      System.err.println("charset = " + charset);
     }
     assertEquals(expected, text);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/FileNameCacheMicroBenchmark.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/FileNameCacheMicroBenchmark.java
index 3721392e28a2..c39712d4d825 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/FileNameCacheMicroBenchmark.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/FileNameCacheMicroBenchmark.java
@@ -185,7 +185,7 @@ public class FileNameCacheMicroBenchmark {
   private abstract static class TestIteration {
     abstract void doTest(int threadNumber, int[] ids, Random threadRandom, int queryCount);
     static void failure() {
-      System.out.println("Failure");
+      System.err.println("Failure");
       assert false;
     }
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
index 42765a974881..0b1ef0a216bf 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
@@ -44,9 +44,9 @@ public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase {
   @SuppressWarnings("UnusedDeclaration")
   public void testCount() throws Exception {
     int count = IElementType.getAllocatedTypesCount();
-    System.out.println("Preloaded: " + count +" element types");
+    LOG.debug("Preloaded: " + count +" element types");
     LanguageExtensionPoint[] extensions = Extensions.getExtensions(new ExtensionPointName<LanguageExtensionPoint>("com.intellij.lang.parserDefinition"));
-    System.out.println("ParserDefinitions: " + extensions.length);
+    LOG.debug("ParserDefinitions: " + extensions.length);
 
     THashMap<Language, String> languageMap = new THashMap<>();
     languageMap.put(Language.ANY, "platform");
@@ -86,7 +86,7 @@ public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase {
       map.put(key, map.get(key) + 1);
       //if (key.equals("unknown")) System.out.println(type +"   " + language);
     }
-    System.out.println("Total: " + IElementType.getAllocatedTypesCount() +" element types");
+    LOG.debug("Total: " + IElementType.getAllocatedTypesCount() +" element types");
 
     // Show per-plugin statistics
     Object[] keys = map.keys();
@@ -96,7 +96,7 @@ public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase {
       int value = map.get((String)key);
       if (value == 0) continue;
       sum += value;
-      System.out.println("  " + key + ": " + value);
+      LOG.debug("  " + key + ": " + value);
     }
 
     // leave some index-space for plugin developers
@@ -136,15 +136,17 @@ public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase {
           PsiElement element = treeElement instanceof PsiElement? (PsiElement)treeElement : definition.createElement(treeElement);
           if (element instanceof PsiLanguageInjectionHost && classes.add(element.getClass().getName())) {
             boolean ok = ElementManipulators.getManipulator(element) != null;
-            System.out.println((ok ? "OK  " : "FAIL") + " " + element.getClass().getSimpleName() + " [" + definition.getClass().getSimpleName() + "]");
-            if (!ok) failures.add(element.getClass().getName());
+            if (!ok) {
+              System.err.println("FAIL" + " " + element.getClass().getSimpleName() + " [" + definition.getClass().getSimpleName() + "]");
+              failures.add(element.getClass().getName());
+            }
           }
         }
         catch (Throwable ignored) {
         }
       }
     }
-    System.out.println("count: " + classes.size() + ", total: " + total);
+    LOG.debug("count: " + classes.size() + ", total: " + total);
     assertEmpty("PsiLanguageInjectionHost requires " + ElementManipulators.EP_NAME, failures);
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
index 42fe097d0309..d89d2ec813d5 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.util.concurrency;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.util.TimeoutUtil;
 import junit.framework.TestCase;
@@ -28,10 +29,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class BoundedScheduledExecutorTest extends TestCase {
+  private static final Logger LOG = Logger.getInstance(BoundedScheduledExecutorTest.class);
   public void testSchedulesAreReallyBound() throws InterruptedException, ExecutionException {
     ExecutorService backendExecutor = AppExecutorUtil.getAppExecutorService();
     for (int maxTasks=1; maxTasks<5;maxTasks++) {
-      System.out.println("maxTasks = " + maxTasks);
+      LOG.debug("maxTasks = " + maxTasks);
       BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(backendExecutor, maxTasks);
       AtomicInteger running = new AtomicInteger();
       AtomicInteger max = new AtomicInteger();
@@ -69,7 +71,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
   public void testSubmitsAreReallyBound() throws InterruptedException, ExecutionException {
     ExecutorService backendExecutor = AppExecutorUtil.getAppExecutorService();
     for (int maxTasks=1; maxTasks<5;maxTasks++) {
-      System.out.println("maxTasks = " + maxTasks);
+      LOG.debug("maxTasks = " + maxTasks);
       BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(backendExecutor, maxTasks);
       AtomicInteger running = new AtomicInteger();
       AtomicInteger max = new AtomicInteger();
@@ -132,7 +134,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
   public void testStressWhenSomeTasksCallOtherTasksGet() throws ExecutionException, InterruptedException {
     ExecutorService backendExecutor = AppExecutorUtil.getAppExecutorService();
     for (int maxSimultaneousTasks = 1; maxSimultaneousTasks<20; maxSimultaneousTasks++) {
-      System.out.println("maxSimultaneousTasks = " + maxSimultaneousTasks);
+      LOG.debug("maxSimultaneousTasks = " + maxSimultaneousTasks);
       BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(backendExecutor, maxSimultaneousTasks);
       AtomicInteger running = new AtomicInteger();
       AtomicInteger maxThreads = new AtomicInteger();
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
index 8ad6de481e32..71b69477a0d4 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
@@ -41,6 +41,9 @@ public class BoundedTaskExecutorTest extends TestCase {
   static {
     Logger.setFactory(TestLoggerFactory.class);
   }
+
+  private static final Logger LOG = Logger.getInstance(BoundedTaskExecutorTest.class);
+  
   @Override
   protected void tearDown() throws Exception {
     try {
@@ -77,7 +80,7 @@ public class BoundedTaskExecutorTest extends TestCase {
 
   public void testReallyBound() throws InterruptedException, ExecutionException {
     for (int maxTasks=1; maxTasks<5;maxTasks++) {
-      System.out.println("maxTasks = " + maxTasks);
+      LOG.debug("maxTasks = " + maxTasks);
       ExecutorService backendExecutor = Executors.newCachedThreadPool(ConcurrencyUtil.newNamedThreadFactory("maxTasks = " + maxTasks));
       BoundedTaskExecutor executor = new BoundedTaskExecutor(getName(), backendExecutor, maxTasks);
       AtomicInteger running = new AtomicInteger();
@@ -396,7 +399,7 @@ public class BoundedTaskExecutorTest extends TestCase {
 
   public void testNoExtraThreadsAreEverCreated() throws ExecutionException, InterruptedException {
     for (int nMaxThreads=1; nMaxThreads<10; nMaxThreads++) {
-      System.out.println("nMaxThreads = " + nMaxThreads);
+      LOG.debug("nMaxThreads = " + nMaxThreads);
       ExecutorService executor = AppExecutorUtil.createBoundedApplicationPoolExecutor(getName(),nMaxThreads);
       int N = 1000000;
       Set<Thread> workers = ContainerUtil.newConcurrentSet();
@@ -460,7 +463,7 @@ public class BoundedTaskExecutorTest extends TestCase {
 
   public void testAwaitTerminationDoesWait() throws InterruptedException {
     for (int maxTasks=1; maxTasks<10; maxTasks++) {
-      System.out.println("maxTasks = " + maxTasks);
+      LOG.debug("maxTasks = " + maxTasks);
       ExecutorService executor = new BoundedTaskExecutor(getName(),PooledThreadExecutor.INSTANCE, maxTasks);
       int N = 1000;
       StringBuffer log = new StringBuffer(N*4);
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/BTreeEnumeratorTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/BTreeEnumeratorTest.java
index 2439078b0010..b0494dc9b016 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/BTreeEnumeratorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/BTreeEnumeratorTest.java
@@ -15,9 +15,9 @@
  */
 package com.intellij.util.io;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.PlatformTestUtil;
-import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.containers.IntObjectCache;
 import gnu.trove.THashMap;
 import junit.framework.TestCase;
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class BTreeEnumeratorTest extends TestCase {
+  private static final Logger LOG = Logger.getInstance(BTreeEnumeratorTest.class);
   private static final String COLLISION_1 = "";
   private static final String COLLISION_2 = "\u0000";
   private static final String UTF_1 = "\ue534";
@@ -173,7 +174,7 @@ public class BTreeEnumeratorTest extends TestCase {
       }
     };
 
-    PlatformTestUtil.startPerformanceTest("PersistentStringEnumerator performance failed", 2500, () -> {
+    PlatformTestUtil.startPerformanceTest("PersistentStringEnumerator", 2500, () -> {
       stringCache.addDeletedPairsListener(listener);
       for (int i = 0; i < 100000; ++i) {
         final String string = createRandomString();
@@ -183,7 +184,7 @@ public class BTreeEnumeratorTest extends TestCase {
       stringCache.removeAll();
     }).useLegacyScaling().assertTiming();
     myEnumerator.close();
-    System.out.printf("File size = %d bytes\n", myFile.length());
+    LOG.debug(String.format("File size = %d bytes\n", myFile.length()));
   }
 
   private static final StringBuilder builder = new StringBuilder(100);
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapPerformanceTest.java
index d1c837281345..8933db92674e 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapPerformanceTest.java
@@ -135,7 +135,7 @@ public class PersistentMapPerformanceTest extends PersistentMapTestBase {
         assertTrue(map.isDirty());  // autocompact on open should leave the map dirty
       }
       assertTrue(!map.makesSenseToCompact());
-      System.out.println(System.currentTimeMillis() - started);
+      LOG.debug(String.valueOf(System.currentTimeMillis() - started));
       for (int i = 0; i < stringsCount; ++i) {
         if (i >= 2 * stringsCount / 3) {
           Integer s = intGetter.readValue(map, i);
@@ -212,7 +212,7 @@ public class PersistentMapPerformanceTest extends PersistentMapTestBase {
       });
       assertTrue(result);
       map.close();
-      System.out.println("Done:" + (System.currentTimeMillis() - started));
+      LOG.debug("Done:" + (System.currentTimeMillis() - started));
       started = System.currentTimeMillis();
       map = new PersistentHashMap<Integer, Integer>(file, EnumeratorIntegerDescriptor.INSTANCE, EnumeratorIntegerDescriptor.INSTANCE) {
         @Override
@@ -234,7 +234,7 @@ public class PersistentMapPerformanceTest extends PersistentMapTestBase {
       });
       assertTrue(result);
 
-      System.out.println("Done 2:" + (System.currentTimeMillis() - started));
+      LOG.debug("Done 2:" + (System.currentTimeMillis() - started));
     }
     finally {
       clearMap(file, map);
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
index 2e50212e0a73..2cde2518acff 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
@@ -250,7 +250,7 @@ public class PersistentMapTest extends PersistentMapTestBase {
       }
     };
 
-    PlatformTestUtil.startPerformanceTest("Performance", 9000, () -> {
+    PlatformTestUtil.startPerformanceTest("put/remove", 9000, () -> {
       try {
         stringCache.addDeletedPairsListener(listener);
         for (int i = 0; i < 100000; ++i) {
@@ -272,9 +272,9 @@ public class PersistentMapTest extends PersistentMapTestBase {
     }).ioBound().useLegacyScaling().assertTiming();
 
     myMap.close();
-    System.out.printf("File size = %d bytes\n", myFile.length());
-    System.out
-      .printf("Data file size = %d bytes\n", new File(myDataFile.getParentFile(), myDataFile.getName() + AbstractStorage.DATA_EXTENSION).length());
+    LOG.debug(String.format("File size = %d bytes\n", myFile.length()));
+    LOG.debug(String.format("Data file size = %d bytes\n",
+                            new File(myDataFile.getParentFile(), myDataFile.getName() + AbstractStorage.DATA_EXTENSION).length()));
   }
 
   public void testPerformance1() throws IOException {
@@ -283,7 +283,7 @@ public class PersistentMapTest extends PersistentMapTestBase {
       strings.add(createRandomString());
     }
 
-    PlatformTestUtil.startPerformanceTest("perf1", 5000, () -> {
+    PlatformTestUtil.startPerformanceTest("put/remove", 5000, () -> {
       for (int i = 0; i < 100000; ++i) {
         final String string = strings.get(i);
         myMap.put(string, string);
@@ -304,9 +304,9 @@ public class PersistentMapTest extends PersistentMapTestBase {
       }
     }).useLegacyScaling().assertTiming();
     myMap.close();
-    System.out.printf("File size = %d bytes\n", myFile.length());
-    System.out
-      .printf("Data file size = %d bytes\n", new File(myDataFile.getParentFile(), myDataFile.getName() + AbstractStorage.DATA_EXTENSION).length());
+    LOG.debug(String.format("File size = %d bytes\n", myFile.length()));
+    LOG.debug(String.format("Data file size = %d bytes\n",
+                            new File(myDataFile.getParentFile(), myDataFile.getName() + AbstractStorage.DATA_EXTENSION).length()));
   }
 
   public void testReadonlyMap() throws IOException {
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTestBase.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTestBase.java
index 371fcbcc0c9f..3391e0510803 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTestBase.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTestBase.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.util.io;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
 
@@ -26,6 +27,7 @@ import java.io.IOException;
  *         Date: Dec 19, 2007
  */
 abstract class PersistentMapTestBase extends TestCase {
+  protected static final Logger LOG = Logger.getInstance(PersistentMapTestBase.class);
   protected PersistentHashMap<String, String> myMap;
   protected File myFile;
   protected File myDataFile;
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java
index e6f4402d93ec..b39c7318c26f 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplaceConfiguration.java
@@ -15,10 +15,12 @@
  */
 package com.intellij.structuralsearch.plugin.replace.ui;
 
-import org.jdom.Element;
-import com.intellij.structuralsearch.plugin.ui.Configuration;
-import com.intellij.structuralsearch.plugin.replace.ReplaceOptions;
 import com.intellij.structuralsearch.MatchOptions;
+import com.intellij.structuralsearch.NamedScriptableDefinition;
+import com.intellij.structuralsearch.plugin.replace.ReplaceOptions;
+import com.intellij.structuralsearch.plugin.ui.Configuration;
+import com.intellij.util.ObjectUtils;
+import org.jdom.Element;
 
 /**
  * @author Maxim.Mossienko
@@ -38,6 +40,11 @@ public class ReplaceConfiguration extends Configuration {
     return options.getMatchOptions();
   }
 
+  @Override
+  public NamedScriptableDefinition findVariable(String name) {
+    return ObjectUtils.chooseNotNull(options.getVariableDefinition(name), getMatchOptions().getVariableConstraint(name));
+  }
+
   @Override
   public void readExternal(Element element) {
     super.readExternal(element);
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java
index c6f3c6e6c9dc..dd32043bb480 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/Configuration.java
@@ -1,8 +1,24 @@
+/*
+ * Copyright 2000-2017 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.structuralsearch.plugin.ui;
 
 import com.intellij.openapi.util.JDOMExternalizable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.structuralsearch.MatchOptions;
+import com.intellij.structuralsearch.NamedScriptableDefinition;
 import org.jdom.Attribute;
 import org.jdom.DataConversionException;
 import org.jdom.Element;
@@ -45,6 +61,7 @@ public abstract class Configuration implements JDOMExternalizable, Comparable<Co
     this.created = created;
   }
 
+  @Override
   public void readExternal(Element element) {
     name = element.getAttributeValue(NAME_ATTRIBUTE_NAME);
     final Attribute attribute = element.getAttribute(CREATED_ATTRIBUTE_NAME);
@@ -56,6 +73,7 @@ public abstract class Configuration implements JDOMExternalizable, Comparable<Co
     }
   }
 
+  @Override
   public void writeExternal(Element element) {
     element.setAttribute(NAME_ATTRIBUTE_NAME,name);
     if (created > 0) {
@@ -73,6 +91,8 @@ public abstract class Configuration implements JDOMExternalizable, Comparable<Co
 
   public abstract MatchOptions getMatchOptions();
 
+  public abstract NamedScriptableDefinition findVariable(String name);
+
   @Override
   public int compareTo(Configuration other) {
     int result = StringUtil.naturalCompare(getCategory(), other.getCategory());
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java
index 2f0d4955c75e..2161990d86fb 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ConfigurationManager.java
@@ -32,6 +32,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @State(name = "StructuralSearchPlugin", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class ConfigurationManager implements PersistentStateComponent<Element> {
@@ -131,6 +133,14 @@ public class ConfigurationManager implements PersistentStateComponent<Element> {
     return config;
   }
 
+  /**
+   * @return the names of all configurations, both user defined and built in.
+   */
+  public List<String> getAllConfigurationNames() {
+    final Stream<Configuration> stream = Stream.concat(StructuralSearchUtil.getPredefinedTemplates().stream(), configurations.stream());
+    return stream.map(c -> c.getName()).collect(Collectors.toList());
+  }
+
   @NotNull
   public Collection<Configuration> getConfigurations() {
     return Collections.unmodifiableList(configurations);
@@ -158,13 +168,14 @@ public class ConfigurationManager implements PersistentStateComponent<Element> {
     return Collections.unmodifiableList(historyConfigurations);
   }
 
-  public static @Nullable String findAppropriateName(@NotNull final Collection<Configuration> configurations, @NotNull String _name,
-                                                     @NotNull final Project project) {
+  @Nullable
+  public static String findAppropriateName(@NotNull final Collection<Configuration> configurations, @NotNull String _name,
+                                           @NotNull final Project project) {
     Configuration config;
     String name = _name;
 
     while ((config = findConfigurationByName(configurations, name)) != null) {
-      int i = Messages.showYesNoDialog(
+      final int i = Messages.showYesNoDialog(
         project,
         SSRBundle.message("overwrite.message"),
         SSRBundle.message("overwrite.title"),
@@ -181,7 +192,8 @@ public class ConfigurationManager implements PersistentStateComponent<Element> {
     return name;
   }
 
-  public static @Nullable String showSaveTemplateAsDialog(@NotNull String initial, @NotNull Project project) {
+  @Nullable
+  public static String showSaveTemplateAsDialog(@NotNull String initial, @NotNull Project project) {
     return Messages.showInputDialog(
       project,
       SSRBundle.message("template.name.button"),
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
index c376265736c8..54b1a6809ae8 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
@@ -37,7 +37,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComponentWithBrowseButton;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.psi.PsiDocumentManager;
@@ -96,7 +95,7 @@ class EditVarConstraintsDialog extends DialogWrapper {
   ComponentWithBrowseButton<EditorTextField> customScriptCode;
   JCheckBox maxoccursUnlimited;
 
-  TextFieldWithBrowseButton withinTextField;
+  TextFieldWithAutoCompletionWithBrowseButton withinTextField;
   private JPanel containedInConstraints;
   private JCheckBox invertWithinIn;
   private JPanel expressionConstraints;
@@ -109,11 +108,11 @@ class EditVarConstraintsDialog extends DialogWrapper {
   private JButton myOneInfinityButton;
   private JButton myZeroOneButton;
 
-  private static Project myProject;
+  private final Project myProject;
 
   EditVarConstraintsDialog(final Project project, Configuration configuration, List<Variable> _variables, final FileType fileType) {
-    super(project, false);
-
+    super(project, true);
+    myProject = project;
     variables = _variables;
     myConfiguration = configuration;
 
@@ -169,8 +168,9 @@ class EditVarConstraintsDialog extends DialogWrapper {
 
     containedInConstraints.setVisible(false);
 
-    withinTextField.setEditable(false);
-    withinTextField.getButton().addActionListener(new ActionListener() {
+    final List<String> names = ConfigurationManager.getInstance(project).getAllConfigurationNames();
+    withinTextField.setAutoCompletionItems(names);
+    withinTextField.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(@NotNull final ActionEvent e) {
         final SelectTemplateDialog dialog = new SelectTemplateDialog(project, false, false);
@@ -542,23 +542,24 @@ class EditVarConstraintsDialog extends DialogWrapper {
 
     myRegExHelpLabel = RegExHelpPopup.createRegExLink(SSRBundle.message("regular.expression.help.label"), regexp, LOG);
     myRegExHelpLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
+    withinTextField = new TextFieldWithAutoCompletionWithBrowseButton(myProject);
   }
 
-  private static EditorTextField createRegexComponent() {
+  private EditorTextField createRegexComponent() {
     @NonNls final String fileName = "1.regexp";
     final FileType fileType = getFileType(fileName);
     final Document doc = createDocument(fileName, fileType, "");
     return new EditorTextField(doc, myProject, fileType);
   }
 
-  private static EditorTextField createScriptComponent() {
+  private EditorTextField createScriptComponent() {
     @NonNls final String fileName = "1.groovy";
     final FileType fileType = getFileType(fileName);
     final Document doc = createDocument(fileName, fileType, "");
     return new EditorTextField(doc, myProject, fileType);
   }
 
-  private static Document createDocument(final String fileName, final FileType fileType, String text) {
+  private Document createDocument(final String fileName, final FileType fileType, String text) {
     final PsiFile file = PsiFileFactory.getInstance(myProject).createFileFromText(fileName, fileType, text, -1, true);
 
     return PsiDocumentManager.getInstance(myProject).getDocument(file);
@@ -570,10 +571,6 @@ class EditVarConstraintsDialog extends DialogWrapper {
     return fileType;
   }
 
-  public static void setProject(final Project project) {
-    myProject = project;
-  }
-
   private static class MyChangeListener implements ChangeListener {
     private final JComponent component;
     private final boolean inverted;
@@ -606,7 +603,7 @@ class EditVarConstraintsDialog extends DialogWrapper {
     }
   }
 
-  static Editor createEditor(final Project project, final String text, final String fileName) {
+  Editor createEditor(final Project project, final String text, final String fileName) {
     final FileType fileType = getFileType(fileName);
     final Document doc = createDocument(fileName, fileType, text);
     final Editor editor = EditorFactory.getInstance().createEditor(doc, project);
@@ -623,11 +620,11 @@ class EditVarConstraintsDialog extends DialogWrapper {
     return editor;
   }
 
-  private static class EditScriptDialog extends DialogWrapper {
+  private class EditScriptDialog extends DialogWrapper {
     private final Editor editor;
     private final String title;
 
-    public EditScriptDialog(Project project, String text, Collection<String> names) {
+    EditScriptDialog(Project project, String text, Collection<String> names) {
       super(project, true);
       setTitle(SSRBundle.message("edit.groovy.script.constraint.title"));
       editor = createEditor(project, text, "1.groovy");
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java
index 695c4d60163f..f4577d74525c 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchConfiguration.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright 2000-2017 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.structuralsearch.plugin.ui;
 
 import com.intellij.structuralsearch.MatchOptions;
+import com.intellij.structuralsearch.NamedScriptableDefinition;
 import org.jdom.Element;
 
 /**
@@ -13,20 +29,28 @@ public class SearchConfiguration extends Configuration {
     matchOptions = new MatchOptions();
   }
 
+  @Override
   public MatchOptions getMatchOptions() {
     return matchOptions;
   }
 
+  @Override
+  public NamedScriptableDefinition findVariable(String name) {
+    return matchOptions.getVariableConstraint(name);
+  }
+
   public void setMatchOptions(MatchOptions matchOptions) {
     this.matchOptions = matchOptions;
   }
 
+  @Override
   public void readExternal(Element element) {
     super.readExternal(element);
 
     matchOptions.readExternal(element);
   }
 
+  @Override
   public void writeExternal(Element element) {
     super.writeExternal(element);
 
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
index d3070c511597..1840bdfa9525 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
@@ -177,7 +177,7 @@ public class SearchDialog extends DialogWrapper {
     return editor;
   }
 
-  private void initiateValidation() {
+  void initiateValidation() {
     myAlarm.cancelAllRequests();
     myAlarm.addRequest(() -> {
       try {
@@ -613,22 +613,18 @@ public class SearchDialog extends DialogWrapper {
 
           @Override
           public void actionPerformed(ActionEvent e) {
-            EditVarConstraintsDialog.setProject(searchContext.getProject());
             new EditVarConstraintsDialog(
               searchContext.getProject(),
               model.getConfig(), getVariablesFromListeners(),
               (FileType)fileTypes.getSelectedItem()
             ).show();
             initiateValidation();
-            EditVarConstraintsDialog.setProject(null);
           }
         }
       )
     );
 
-    panel.add(
-      Box.createHorizontalStrut(8)
-    );
+    panel.add(Box.createHorizontalStrut(8));
 
     panel.add(
       createJButtonForAction(
@@ -652,9 +648,7 @@ public class SearchDialog extends DialogWrapper {
       )
     );
 
-    panel.add(
-      Box.createHorizontalStrut(8)
-    );
+    panel.add(Box.createHorizontalStrut(8));
 
     panel.add(
       createJButtonForAction(
@@ -686,7 +680,7 @@ public class SearchDialog extends DialogWrapper {
   }
 
   protected static List<Variable> getVarsFrom(Editor searchCriteriaEdit) {
-    SubstitutionShortInfoHandler handler = searchCriteriaEdit.getUserData(UIUtil.LISTENER_KEY);
+    SubstitutionShortInfoHandler handler = SubstitutionShortInfoHandler.retrieve(searchCriteriaEdit);
     return (handler == null) ? new ArrayList<>() : new ArrayList<>(handler.getVariables());
   }
 
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
index 527cae13a981..cc79c557b011 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
@@ -16,6 +16,7 @@
 package com.intellij.structuralsearch.plugin.ui;
 
 import com.intellij.codeInsight.hint.TooltipController;
+import com.intellij.codeInsight.hint.TooltipGroup;
 import com.intellij.codeInsight.template.impl.TemplateImplUtil;
 import com.intellij.codeInsight.template.impl.Variable;
 import com.intellij.openapi.editor.Document;
@@ -23,11 +24,20 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.*;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.structuralsearch.MatchVariableConstraint;
+import com.intellij.structuralsearch.NamedScriptableDefinition;
+import com.intellij.structuralsearch.SSRBundle;
+import com.intellij.ui.HintHint;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 
 public class SubstitutionShortInfoHandler implements DocumentListener, EditorMouseMotionListener, CaretListener {
+  private static final Key<SubstitutionShortInfoHandler> LISTENER_KEY = Key.create("sslistener.key");
+  private static final TooltipGroup SS_INFO_TOOLTIP_GROUP = new TooltipGroup("SS_INFO_TOOLTIP_GROUP", 0);
   private long modificationTimeStamp;
   private final ArrayList<Variable> variables = new ArrayList<>();
   private final Editor editor;
@@ -71,13 +81,13 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou
         }
 
         if (foundVar!=null) {
-          text = UIUtil.getShortParamString(editor.getUserData(CURRENT_CONFIGURATION_KEY),varname);
+          text = getShortParamString(editor.getUserData(CURRENT_CONFIGURATION_KEY),varname);
         }
       }
     }
 
     if (text.length() > 0) {
-      UIUtil.showTooltip(editor, start, end + 1, text);
+      showTooltip(editor, start, end + 1, text);
     }
     else {
       TooltipController.getInstance().cancelTooltips();
@@ -106,4 +116,118 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou
     checkModelValidity();
     return variables;
   }
+
+  private static String getShortParamString(Configuration config, String varname) {
+    if (config == null) return "";
+
+    return getShortParamString(config.findVariable(varname));
+  }
+
+  @NotNull
+  static String getShortParamString(NamedScriptableDefinition namedScriptableDefinition) {
+    if (namedScriptableDefinition == null) {
+      return SSRBundle.message("no.constraints.specified.tooltip.message");
+    }
+
+    final StringBuilder buf = new StringBuilder();
+
+    if (namedScriptableDefinition instanceof MatchVariableConstraint) {
+      final MatchVariableConstraint constraint = (MatchVariableConstraint)namedScriptableDefinition;
+      if (constraint.isPartOfSearchResults()) {
+        append(buf, SSRBundle.message("target.tooltip.message"));
+      }
+      if (constraint.getRegExp() != null && constraint.getRegExp().length() > 0) {
+        append(buf, SSRBundle.message("text.tooltip.message",
+                                      constraint.isInvertRegExp() ? SSRBundle.message("not.tooltip.message") : "", constraint.getRegExp()));
+      }
+      if (constraint.isWithinHierarchy() || constraint.isStrictlyWithinHierarchy()) {
+        append(buf, SSRBundle.message("within.hierarchy.tooltip.message"));
+      }
+
+      if (constraint.getNameOfExprType() != null && constraint.getNameOfExprType().length() > 0) {
+        append(buf, SSRBundle.message("exprtype.tooltip.message",
+                                     constraint.isInvertExprType() ? SSRBundle.message("not.tooltip.message") : "",
+                                     constraint.getNameOfExprType(),
+                                     constraint.isExprTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
+      }
+
+      if (constraint.getNameOfFormalArgType() != null && constraint.getNameOfFormalArgType().length() > 0) {
+        append(buf, SSRBundle.message("expected.type.tooltip.message",
+                                      constraint.isInvertFormalType() ? SSRBundle.message("not.tooltip.message") : "",
+                                      constraint.getNameOfFormalArgType(),
+                                      constraint.isFormalArgTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
+      }
+
+      if (StringUtil.isNotEmpty(constraint.getWithinConstraint())) {
+        final String text = StringUtil.unquoteString(constraint.getWithinConstraint());
+        append(buf, constraint.isInvertWithinConstraint()
+                    ? SSRBundle.message("not.within.constraints.tooltip.message", text)
+                    : SSRBundle.message("within.constraints.tooltip.message", text));
+      }
+
+      final String name = constraint.getName();
+      if (!Configuration.CONTEXT_VAR_NAME.equals(name)) {
+        if (constraint.getMinCount() == constraint.getMaxCount()) {
+          append(buf, SSRBundle.message("occurs.tooltip.message", constraint.getMinCount()));
+        }
+        else {
+          append(buf, SSRBundle.message("min.occurs.tooltip.message", constraint.getMinCount(),
+                                        constraint.getMaxCount() == Integer.MAX_VALUE ?
+                                        StringUtil.decapitalize(SSRBundle.message("editvarcontraints.unlimited")) :
+                                        constraint.getMaxCount()));
+        }
+      }
+    }
+
+    final String script = namedScriptableDefinition.getScriptCodeConstraint();
+    if (script != null && script.length() > 2) {
+      final String str = SSRBundle.message("script.tooltip.message", StringUtil.unquoteString(script));
+      append(buf, str);
+    }
+
+    if (buf.length() == 0) {
+      return SSRBundle.message("no.constraints.specified.tooltip.message");
+    }
+    return buf.toString();
+  }
+
+  private static void append(final StringBuilder buf, final String str) {
+    if (buf.length() > 0) buf.append(", ");
+    buf.append(str);
+  }
+
+  private static void showTooltip(@NotNull Editor editor, final int start, int end, @NotNull String text) {
+    final Rectangle visibleArea = editor.getScrollingModel().getVisibleArea();
+    final Point left = editor.logicalPositionToXY(editor.offsetToLogicalPosition(start));
+    final int documentLength = editor.getDocument().getTextLength();
+    if (end >= documentLength) end = documentLength;
+    final Point right = editor.logicalPositionToXY(editor.offsetToLogicalPosition(end));
+
+    final Point bestPoint = new Point(left.x + (right.x - left.x) / 2, right.y + editor.getLineHeight() / 2);
+
+    if (visibleArea.x > bestPoint.x) {
+      bestPoint.x = visibleArea.x;
+    }
+    else if (visibleArea.x + visibleArea.width < bestPoint.x) {
+      bestPoint.x = visibleArea.x + visibleArea.width - 5;
+    }
+
+    final Point p = SwingUtilities.convertPoint(editor.getContentComponent(), bestPoint,
+                                                editor.getComponent().getRootPane().getLayeredPane());
+    final HintHint hint = new HintHint(editor, bestPoint).setAwtTooltip(true).setHighlighterType(true).setShowImmediately(true)
+      .setCalloutShift(editor.getLineHeight() / 2 - 1);
+    TooltipController.getInstance().showTooltip(editor, p, text, visibleArea.width, false, SS_INFO_TOOLTIP_GROUP, hint);
+  }
+
+  static SubstitutionShortInfoHandler retrieve(Editor editor) {
+    return editor.getUserData(LISTENER_KEY);
+  }
+
+  static void install(Editor editor) {
+    final SubstitutionShortInfoHandler handler = new SubstitutionShortInfoHandler(editor);
+    editor.addEditorMouseMotionListener(handler);
+    editor.getDocument().addDocumentListener(handler);
+    editor.getCaretModel().addCaretListener(handler);
+    editor.putUserData(LISTENER_KEY, handler);
+  }
 }
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/TextFieldWithAutoCompletionWithBrowseButton.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/TextFieldWithAutoCompletionWithBrowseButton.java
new file mode 100644
index 000000000000..219c83fb6baa
--- /dev/null
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/TextFieldWithAutoCompletionWithBrowseButton.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2000-2017 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.structuralsearch.plugin.ui;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.ComponentWithBrowseButton;
+import com.intellij.ui.TextAccessor;
+import com.intellij.ui.TextFieldWithAutoCompletion;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class TextFieldWithAutoCompletionWithBrowseButton
+  extends ComponentWithBrowseButton<TextFieldWithAutoCompletion<String>> implements TextAccessor {
+
+  public TextFieldWithAutoCompletionWithBrowseButton(Project project) {
+    super(TextFieldWithAutoCompletion.create(project, Collections.emptyList(), false, null), null);
+  }
+
+  @Override
+  public String getText() {
+    return getChildComponent().getText();
+  }
+
+  public void setAutoCompletionItems(Collection<String> items) {
+    System.out.println("names = " + items);
+    getChildComponent().setVariants(items);
+  }
+
+  @Override
+  public void setText(String text) {
+    getChildComponent().setText(text);
+  }
+}
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
index 874a9e611ab6..243c16461c5a 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
@@ -15,8 +15,6 @@
  */
 package com.intellij.structuralsearch.plugin.ui;
 
-import com.intellij.codeInsight.hint.TooltipController;
-import com.intellij.codeInsight.hint.TooltipGroup;
 import com.intellij.codeInsight.template.TemplateContextType;
 import com.intellij.codeInsight.template.impl.TemplateEditorUtil;
 import com.intellij.icons.AllIcons;
@@ -34,13 +32,12 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.Balloon;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.structuralsearch.*;
+import com.intellij.structuralsearch.MatchOptions;
+import com.intellij.structuralsearch.MatchVariableConstraint;
+import com.intellij.structuralsearch.SSRBundle;
+import com.intellij.structuralsearch.StructuralSearchProfile;
 import com.intellij.structuralsearch.plugin.StructuralReplaceAction;
 import com.intellij.structuralsearch.plugin.StructuralSearchAction;
-import com.intellij.structuralsearch.plugin.replace.ui.ReplaceConfiguration;
-import com.intellij.ui.HintHint;
 import com.intellij.util.Producer;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -57,9 +54,7 @@ import java.awt.event.MouseEvent;
  * Time: 7:50:48 PM
  */
 public class UIUtil {
-  static Key<SubstitutionShortInfoHandler> LISTENER_KEY = Key.create("sslistener.key");
   private static final String MODIFY_EDITOR_CONTENT = SSRBundle.message("modify.editor.content.command.name");
-  private static final TooltipGroup SS_INFO_TOOLTIP_GROUP = new TooltipGroup("SS_INFO_TOOLTIP_GROUP", 0);
   @NonNls private static final String SS_GROUP = "structuralsearchgroup";
 
   @NotNull
@@ -101,11 +96,7 @@ public class UIUtil {
     TemplateEditorUtil.setHighlighter(editor, contextType);
 
     if (addToolTipForVariableHandler) {
-      SubstitutionShortInfoHandler handler = new SubstitutionShortInfoHandler(editor);
-      editor.addEditorMouseMotionListener(handler);
-      editor.getDocument().addDocumentListener(handler);
-      editor.getCaretModel().addCaretListener(handler);
-      editor.putUserData(LISTENER_KEY, handler);
+      SubstitutionShortInfoHandler.install(editor);
     }
 
     return editor;
@@ -133,93 +124,10 @@ public class UIUtil {
   public static void setContent(final Editor editor, String val, final int from, final int end, final Project project) {
     final String value = val != null ? val : "";
 
-    CommandProcessor.getInstance().executeCommand(project, () -> ApplicationManager.getApplication().runWriteAction(() -> editor.getDocument().replaceString(from, (end == -1) ? editor.getDocument().getTextLength() : end, value)), MODIFY_EDITOR_CONTENT, SS_GROUP);
-  }
-
-  static String getShortParamString(Configuration config, String varname) {
-    if (config == null) return "";
-    final MatchOptions options = config.getMatchOptions();
-
-    NamedScriptableDefinition namedScriptableDefinition = options == null ? null : options.getVariableConstraint(varname);
-
-    final ReplacementVariableDefinition replacementVariableDefinition =
-      config instanceof ReplaceConfiguration ? ((ReplaceConfiguration)config).getReplaceOptions().getVariableDefinition(varname) : null;
-    if (replacementVariableDefinition != null) namedScriptableDefinition = replacementVariableDefinition;
-
-    return getShortParamString(namedScriptableDefinition);
-  }
-
-  @NotNull
-  public static String getShortParamString(NamedScriptableDefinition namedScriptableDefinition) {
-    if (namedScriptableDefinition == null) {
-      return SSRBundle.message("no.constraints.specified.tooltip.message");
-    }
-
-    final StringBuilder buf = new StringBuilder();
-
-    if (namedScriptableDefinition instanceof MatchVariableConstraint) {
-      final MatchVariableConstraint constraint = (MatchVariableConstraint)namedScriptableDefinition;
-      if (constraint.isPartOfSearchResults()) {
-        append(buf, SSRBundle.message("target.tooltip.message"));
-      }
-      if (constraint.getRegExp() != null && constraint.getRegExp().length() > 0) {
-        append(buf, SSRBundle.message("text.tooltip.message",
-                                      constraint.isInvertRegExp() ? SSRBundle.message("not.tooltip.message") : "", constraint.getRegExp()));
-      }
-      if (constraint.isWithinHierarchy() || constraint.isStrictlyWithinHierarchy()) {
-        append(buf, SSRBundle.message("within.hierarchy.tooltip.message"));
-      }
-
-      if (constraint.getNameOfExprType() != null && constraint.getNameOfExprType().length() > 0) {
-        append(buf, SSRBundle.message("exprtype.tooltip.message",
-                                     constraint.isInvertExprType() ? SSRBundle.message("not.tooltip.message") : "",
-                                     constraint.getNameOfExprType(),
-                                     constraint.isExprTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
-      }
-
-      if (constraint.getNameOfFormalArgType() != null && constraint.getNameOfFormalArgType().length() > 0) {
-        append(buf, SSRBundle.message("expected.type.tooltip.message",
-                                      constraint.isInvertFormalType() ? SSRBundle.message("not.tooltip.message") : "",
-                                      constraint.getNameOfFormalArgType(),
-                                      constraint.isFormalArgTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
-      }
-
-      if (StringUtil.isNotEmpty(constraint.getWithinConstraint())) {
-        final String text = StringUtil.unquoteString(constraint.getWithinConstraint());
-        append(buf, constraint.isInvertWithinConstraint()
-                    ? SSRBundle.message("not.within.constraints.tooltip.message", text)
-                    : SSRBundle.message("within.constraints.tooltip.message", text));
-      }
-
-      final String name = constraint.getName();
-      if (!Configuration.CONTEXT_VAR_NAME.equals(name)) {
-        if (constraint.getMinCount() == constraint.getMaxCount()) {
-          append(buf, SSRBundle.message("occurs.tooltip.message", constraint.getMinCount()));
-        }
-        else {
-          append(buf, SSRBundle.message("min.occurs.tooltip.message", constraint.getMinCount(),
-                                        constraint.getMaxCount() == Integer.MAX_VALUE ?
-                                        StringUtil.decapitalize(SSRBundle.message("editvarcontraints.unlimited")) :
-                                        constraint.getMaxCount()));
-        }
-      }
-    }
-
-    final String script = namedScriptableDefinition.getScriptCodeConstraint();
-    if (script != null && script.length() > 2) {
-      final String str = SSRBundle.message("script.tooltip.message", StringUtil.stripQuotesAroundValue(script));
-      append(buf, str);
-    }
-
-    if (buf.length() == 0) {
-      return SSRBundle.message("no.constraints.specified.tooltip.message");
-    }
-    return buf.toString();
-  }
-
-  private static void append(final StringBuilder buf, final String str) {
-    if (buf.length() > 0) buf.append(", ");
-    buf.append(str);
+    CommandProcessor.getInstance().executeCommand(
+      project, () -> ApplicationManager.getApplication().runWriteAction(
+        () -> editor.getDocument().replaceString(from, (end == -1) ? editor.getDocument().getTextLength() : end, value)),
+      MODIFY_EDITOR_CONTENT, SS_GROUP);
   }
 
   public static void invokeAction(Configuration config, SearchContext context) {
@@ -231,29 +139,6 @@ public class UIUtil {
     }
   }
 
-  static void showTooltip(@NotNull Editor editor, final int start, int end, @NotNull String text) {
-    final Rectangle visibleArea = editor.getScrollingModel().getVisibleArea();
-    final Point left = editor.logicalPositionToXY(editor.offsetToLogicalPosition(start));
-    final int documentLength = editor.getDocument().getTextLength();
-    if (end >= documentLength) end = documentLength;
-    final Point right = editor.logicalPositionToXY(editor.offsetToLogicalPosition(end));
-
-    final Point bestPoint = new Point(left.x + (right.x - left.x) / 2, right.y + editor.getLineHeight() / 2);
-
-    if (visibleArea.x > bestPoint.x) {
-      bestPoint.x = visibleArea.x;
-    }
-    else if (visibleArea.x + visibleArea.width < bestPoint.x) {
-      bestPoint.x = visibleArea.x + visibleArea.width - 5;
-    }
-
-    final Point p = SwingUtilities.convertPoint(editor.getContentComponent(), bestPoint,
-                                                editor.getComponent().getRootPane().getLayeredPane());
-    final HintHint hint = new HintHint(editor, bestPoint).setAwtTooltip(true).setHighlighterType(true).setShowImmediately(true)
-      .setCalloutShift(editor.getLineHeight() / 2 - 1);
-    TooltipController.getInstance().showTooltip(editor, p, text, visibleArea.width, false, SS_INFO_TOOLTIP_GROUP, hint);
-  }
-
   public static void updateHighlighter(Editor editor, StructuralSearchProfile profile) {
     TemplateEditorUtil.setHighlighter(editor, profile.getTemplateContextType());
   }
@@ -310,7 +195,8 @@ public class UIUtil {
         if (isTarget(Configuration.CONTEXT_VAR_NAME, matchOptions)) {
           constraint.setPartOfSearchResults(true);
         }
-        label.setText(SSRBundle.message("complete.match.variable.tooltip.message", getShortParamString(constraint)));
+        label.setText(SSRBundle.message("complete.match.variable.tooltip.message",
+                                        SubstitutionShortInfoHandler.getShortParamString(constraint)));
         final IdeTooltipManager tooltipManager = IdeTooltipManager.getInstance();
         tooltipManager.show(tooltip, true);
       }
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form
index 5006ae64963f..e7e0778b0dff 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/VarConstraints.form
@@ -302,7 +302,7 @@
         </clientProperties>
         <border type="none" title-resource-bundle="messages/SSRBundle" title-key="var.constraints.within.pattern.border"/>
         <children>
-          <component id="ecda0" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="withinTextField">
+          <component id="bfd62" class="com.intellij.structuralsearch.plugin.ui.TextFieldWithAutoCompletionWithBrowseButton" binding="withinTextField" custom-create="true">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
index 9aa516e4142e..ee490c19f5fb 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
@@ -113,7 +113,6 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
   protected Module myModule;
   protected static final Collection<File> myFilesToDelete = new THashSet<>();
   protected boolean myAssertionsInTestDetected;
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.PlatformTestCase");
   public static Thread ourTestThread;
   private static TestCase ourTestCase;
   private static final long DEFAULT_TEST_TIME = 300L;
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/IdeFrameFixture.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/IdeFrameFixture.java
index 20654fc3465f..9d77b59e999a 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/IdeFrameFixture.java
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/IdeFrameFixture.java
@@ -65,7 +65,6 @@ import java.io.File;
 import java.util.*;
 import java.util.List;
 
-import static com.intellij.ide.impl.ProjectUtil.closeAndDispose;
 import static com.intellij.openapi.util.io.FileUtil.getRelativePath;
 import static com.intellij.openapi.util.io.FileUtil.toSystemDependentName;
 import static com.intellij.openapi.util.text.StringUtil.isNotEmpty;
@@ -79,7 +78,7 @@ import static org.fest.util.Strings.quote;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
-public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameImpl>{
+public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameImpl> {
   @NotNull private final File myProjectPath;
 
   private EditorFixture myEditor;
@@ -91,7 +90,8 @@ public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameI
       protected boolean isMatching(@NotNull IdeFrameImpl frame) {
         Project project = frame.getProject();
         if (projectPath == null && project != null) return true;
-        if (project != null && PathManager.getAbsolutePath(projectPath.getPath()).equals(PathManager.getAbsolutePath(project.getBasePath()))) {
+        if (project != null &&
+            PathManager.getAbsolutePath(projectPath.getPath()).equals(PathManager.getAbsolutePath(project.getBasePath()))) {
           return projectName == null || projectName.equals(project.getName());
         }
         return false;
@@ -307,8 +307,11 @@ public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameI
     ActionManager actionManager = ActionManager.getInstance();
     AnAction mainMenuAction = actionManager.getAction(mainMenuActionId);
     JMenuBar jMenuBar = this.target().getRootPane().getJMenuBar();
-    MouseEvent fakeMainMenuMouseEvent = new MouseEvent(jMenuBar, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, MouseInfo.getPointerInfo().getLocation().x, MouseInfo.getPointerInfo().getLocation().y, 1,  false);
-    ApplicationManager.getApplication().invokeLater(() -> actionManager.tryToExecute(mainMenuAction, fakeMainMenuMouseEvent, null, ActionPlaces.MAIN_MENU, true));
+    MouseEvent fakeMainMenuMouseEvent =
+      new MouseEvent(jMenuBar, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, MouseInfo.getPointerInfo().getLocation().x,
+                     MouseInfo.getPointerInfo().getLocation().y, 1, false);
+    ApplicationManager.getApplication()
+      .invokeLater(() -> actionManager.tryToExecute(mainMenuAction, fakeMainMenuMouseEvent, null, ActionPlaces.MAIN_MENU, true));
   }
 
   /**
@@ -651,10 +654,10 @@ public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameI
   }
 
   public void closeProject() {
+    invokeMainMenu("CloseProject");
     execute(new GuiTask() {
       @Override
       protected void executeInEDT() throws Throwable {
-        closeAndDispose(getProject());
         RecentProjectsManager.getInstance().updateLastProjectPath();
         WelcomeFrame.showIfNoProjectOpened();
       }
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.java
index 000c66268675..6d433c95174e 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.java
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestUtil.java
@@ -868,7 +868,6 @@ GuiTestUtil {
   }
 
   public static void invokeAction(@NotNull Robot robot, @NotNull String actionId) {
-
     KeyboardShortcut keyboardShortcut = ActionManager.getInstance().getKeyboardShortcut(actionId);
 
     assert keyboardShortcut != null;
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
index 64c9d43b79dd..d38d40fc8ec3 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
@@ -101,31 +101,31 @@ open class GuiTestCase : GuiTestBase() {
 
   //*********CONTEXT FUNCTIONS ON LAMBDA RECEIVERS
   open fun welcomeFrame(func: WelcomeFrameFixture.() -> Unit) {
-    func.invoke(findWelcomeFrame())
+    func(findWelcomeFrame())
   }
 
   fun ideFrame(func: IdeFrameFixture.() -> Unit) {
-    func.invoke(findIdeFrame())
+    func(findIdeFrame())
   }
 
   fun dialog(title: String? = null, timeout: Long = defaultTimeout, func: JDialogFixture.() -> Unit) {
-    func.invoke(dialog(title, timeout))
+    func(dialog(title, timeout))
   }
 
   fun simpleProject(func: IdeFrameFixture.() -> Unit) {
-    func.invoke(importSimpleProject())
+    func(importSimpleProject())
   }
 
   fun projectWizard(func: NewProjectWizardFixture.() -> Unit) {
-    func.invoke(findNewProjectWizard())
+    func(findNewProjectWizard())
   }
 
   fun IdeFrameFixture.projectView(func: ProjectViewFixture.() -> Unit) {
-    func.invoke(this.projectView)
+    func(this.projectView)
   }
 
   fun IdeFrameFixture.toolwindow(id: String, func: CustomToolWindowFixture.() -> Unit) {
-    func.invoke(CustomToolWindowFixture(id, this))
+    func(CustomToolWindowFixture(id, this))
   }
 
   //*********FIXTURES METHODS WITHOUT ROBOT and TARGET; KOTLIN ONLY
@@ -213,7 +213,7 @@ open class GuiTestCase : GuiTestBase() {
 
   //*********FIXTURES METHODS FOR IDEFRAME WITHOUT ROBOT and TARGET; KOTLIN ONLY
   fun IdeFrameFixture.editor(/*timeout in seconds*/ timeout: Long = defaultTimeout, func: EditorFixture.() -> Unit) {
-    func.invoke(this.editor)
+    func(this.editor)
   }
 
   fun IdeFrameFixture.popup(vararg path: String) = this.invokeMenuPath(*path)
@@ -222,6 +222,7 @@ open class GuiTestCase : GuiTestBase() {
   fun typeText(text: String) = GuiTestUtil.typeText(text, myRobot, 10)
 
   fun shortcut(keyStroke: String) = GuiTestUtil.invokeActionViaShortcut(myRobot, keyStroke)
+
   fun screenshot(component: Component, screenshotName: String): Unit {
 
     val extension = "${getScaleSuffix()}.png"
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestUtilKt.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestUtilKt.kt
index e16b4b91245d..9895d83de2ab 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestUtilKt.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestUtilKt.kt
@@ -80,7 +80,7 @@ object GuiTestUtilKt {
 
   private fun String.withoutIndent() = this.substring(this.getIndent())
 
-  private fun String.multiply(n: Int): String {
+  private operator fun String.times(n: Int): String {
     val sb = StringBuilder(n)
     for (i in 1..n) {
       sb.append(this)
@@ -99,7 +99,7 @@ object GuiTestUtilKt {
     }
 
     fun printRecursive(root: ImmutableTreeNode<Value>, indent: Int) {
-      println(" ".multiply(indent) + root.value)
+      println(" " * indent + root.value)
       if (!root.isLeaf()) root.children.forEach { printRecursive(it, indent + 2) }
     }
 
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/remote/server/JUnitServerImpl.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/remote/server/JUnitServerImpl.kt
index db55231a6024..99d102098b22 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/remote/server/JUnitServerImpl.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/remote/server/JUnitServerImpl.kt
@@ -158,6 +158,10 @@ class JUnitServerImpl: JUnitServer {
       catch(e: InterruptedException) {
         Thread.currentThread().interrupt()
       }
+      catch (e: Exception) {
+        if (e is InvalidClassException) LOG.error("Probably client is down:", e)
+        failHandler?.invoke(e)
+      }
       finally {
         objectOutputStream.close()
       }
diff --git a/platform/testGuiFramework/testGuiFramework.iml b/platform/testGuiFramework/testGuiFramework.iml
index 4c49dfea5bb3..c9d525589302 100644
--- a/platform/testGuiFramework/testGuiFramework.iml
+++ b/platform/testGuiFramework/testGuiFramework.iml
@@ -9,9 +9,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="platform-impl" exported="" />
     <orderEntry type="library" exported="" name="fest" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" exported="" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="bootstrap" />
diff --git a/platform/usageView/src/com/intellij/usages/FindUsagesProcessPresentation.java b/platform/usageView/src/com/intellij/usages/FindUsagesProcessPresentation.java
index d73c901764c0..ee09f52560f4 100644
--- a/platform/usageView/src/com/intellij/usages/FindUsagesProcessPresentation.java
+++ b/platform/usageView/src/com/intellij/usages/FindUsagesProcessPresentation.java
@@ -18,25 +18,18 @@ package com.intellij.usages;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.Factory;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * @author max
  */
 public class FindUsagesProcessPresentation {
-  @NonNls
-  public static final String NAME_WITH_MNEMONIC_KEY = "NameWithMnemonic";
   private final UsageViewPresentation myUsageViewPresentation;
 
-  private List<Action> myNotFoundActions;
   private boolean myShowPanelIfOnlyOneUsage;
   private boolean myShowNotFoundMessage;
   private Factory<ProgressIndicator> myProgressIndicatorFactory;
@@ -49,16 +42,6 @@ public class FindUsagesProcessPresentation {
     myUsageViewPresentation = presentation;
   }
 
-  public void addNotFoundAction(@NotNull Action action) {
-    if (myNotFoundActions == null) myNotFoundActions = new ArrayList<>();
-    myNotFoundActions.add(action);
-  }
-
-  @NotNull
-  public List<Action> getNotFoundActions() {
-    return myNotFoundActions == null ? Collections.emptyList() : myNotFoundActions;
-  }
-
   public boolean isShowNotFoundMessage() {
     return myShowNotFoundMessage;
   }
diff --git a/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java b/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java
index 8e034bc05633..461325770511 100644
--- a/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java
+++ b/platform/usageView/src/com/intellij/usages/UsageViewPresentation.java
@@ -19,10 +19,6 @@ import com.intellij.usageView.UsageViewBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author max
  */
@@ -45,7 +41,6 @@ public class UsageViewPresentation {
   private String myTabName;
   private String myToolwindowTitle;
 
-  private List<Action> myNotFoundActions;
   private boolean myDetachedMode; // no UI will be shown
   private String myDynamicCodeUsagesString;
   private boolean myMergeDupLinesAvailable = true;
@@ -144,15 +139,6 @@ public class UsageViewPresentation {
     myCodeUsages = codeUsages;
   }
 
-  public void addNotFoundAction(Action _action) {
-    if (myNotFoundActions == null) myNotFoundActions = new ArrayList<>();
-    myNotFoundActions.add(_action);
-  }
-
-  public List<Action> getNotFoundActions() {
-    return myNotFoundActions;
-  }
-
   @NotNull
   public String getUsagesWord() {
     return myUsagesWord;
@@ -251,7 +237,6 @@ public class UsageViewPresentation {
     if (myNonCodeUsagesString != null ? !myNonCodeUsagesString.equals(that.myNonCodeUsagesString) : that.myNonCodeUsagesString != null) {
       return false;
     }
-    if (myNotFoundActions != null ? !myNotFoundActions.equals(that.myNotFoundActions) : that.myNotFoundActions != null) return false;
     if (myScopeText != null ? !myScopeText.equals(that.myScopeText) : that.myScopeText != null) return false;
     if (myTabName != null ? !myTabName.equals(that.myTabName) : that.myTabName != null) return false;
     if (myTabText != null ? !myTabText.equals(that.myTabText) : that.myTabText != null) return false;
@@ -286,7 +271,6 @@ public class UsageViewPresentation {
     result = 31 * result + (myUsagesWord != null ? myUsagesWord.hashCode() : 0);
     result = 31 * result + (myTabName != null ? myTabName.hashCode() : 0);
     result = 31 * result + (myToolwindowTitle != null ? myToolwindowTitle.hashCode() : 0);
-    result = 31 * result + (myNotFoundActions != null ? myNotFoundActions.hashCode() : 0);
     result = 31 * result + (myDetachedMode ? 1 : 0);
     result = 31 * result + (myDynamicCodeUsagesString != null ? myDynamicCodeUsagesString.hashCode() : 0);
     result = 31 * result + (myMergeDupLinesAvailable ? 1 : 0);
diff --git a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
index 4fe660caf131..3d3b90f24b1f 100644
--- a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
+++ b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
@@ -34,7 +34,6 @@ import com.intellij.openapi.progress.util.ProgressWrapper;
 import com.intellij.openapi.progress.util.TooManyUsagesStatus;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
-import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Factory;
@@ -50,7 +49,6 @@ import com.intellij.ui.HyperlinkAdapter;
 import com.intellij.usageView.UsageViewBundle;
 import com.intellij.usages.*;
 import com.intellij.util.Alarm;
-import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.Processors;
 import com.intellij.util.ui.RangeBlinker;
@@ -63,7 +61,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
-import java.awt.event.ActionEvent;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -384,44 +381,24 @@ class SearchForUsagesRunnable implements Runnable {
               return;
             }
 
-            final List<Action> notFoundActions = myProcessPresentation.getNotFoundActions();
             final String message = UsageViewBundle.message("dialog.no.usages.found.in",
                                                            StringUtil.decapitalize(myPresentation.getUsagesString()),
                                                            myPresentation.getScopeText(),
                                                            myPresentation.getContextText()
                                                            );
 
-            if (notFoundActions.isEmpty()) {
-              List<String> lines = new ArrayList<>();
-              lines.add(StringUtil.escapeXml(message));
-              if (myOutOfScopeUsages.get() != 0) {
-                lines.add(UsageViewManagerImpl.outOfScopeMessage(myOutOfScopeUsages.get(), mySearchScopeToWarnOfFallingOutOf));
-              }
-              if (myProcessPresentation.isShowFindOptionsPrompt()) {
-                lines.add(createOptionsHtml(mySearchFor));
-              }
-              MessageType type = myOutOfScopeUsages.get() == 0 ? MessageType.INFO : MessageType.WARNING;
-              notifyByFindBalloon(createGotToOptionsListener(mySearchFor),
-                                  type, myProcessPresentation, myProject, lines);
-              findStartedBalloonShown.set(false);
+            List<String> lines = new ArrayList<>();
+            lines.add(StringUtil.escapeXml(message));
+            if (myOutOfScopeUsages.get() != 0) {
+              lines.add(UsageViewManagerImpl.outOfScopeMessage(myOutOfScopeUsages.get(), mySearchScopeToWarnOfFallingOutOf));
             }
-            else {
-              List<String> titles = new ArrayList<>(notFoundActions.size() + 1);
-              titles.add(UsageViewBundle.message("dialog.button.ok"));
-              for (Action action : notFoundActions) {
-                Object value = action.getValue(FindUsagesProcessPresentation.NAME_WITH_MNEMONIC_KEY);
-                if (value == null) value = action.getValue(Action.NAME);
-
-                titles.add((String)value);
-              }
-
-              int option = Messages.showDialog(myProject, message, UsageViewBundle.message("dialog.title.information"),
-                                               ArrayUtil.toStringArray(titles), 0, Messages.getInformationIcon());
-
-              if (option > 0) {
-                notFoundActions.get(option - 1).actionPerformed(new ActionEvent(this, 0, titles.get(option)));
-              }
+            if (myProcessPresentation.isShowFindOptionsPrompt()) {
+              lines.add(createOptionsHtml(mySearchFor));
             }
+            MessageType type = myOutOfScopeUsages.get() == 0 ? MessageType.INFO : MessageType.WARNING;
+            notifyByFindBalloon(createGotToOptionsListener(mySearchFor),
+                                type, myProcessPresentation, myProject, lines);
+            findStartedBalloonShown.set(false);
           }
         }, ModalityState.NON_MODAL, myProject.getDisposed());
     }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 950686bd0037..e0cec6aa00da 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1168,4 +1168,7 @@ ESLint.Language.Service.full.log=false
 ESLint.Language.Service.full.log.description=ESLint: include source code fragments with errors info language service messages
 
 goto.action.skip.tophits.and.options=false
-goto.action.skip.tophits.and.options.description=Skip top hits and options in go to action
\ No newline at end of file
+goto.action.skip.tophits.and.options.description=Skip top hits and options in go to action
+
+dsm.show.cycle.count.in.tooltip=false
+dsm.show.cycle.count.in.tooltip.description=Shows number of cycles found in the tooltip of the Toggle Cycles toolbar button after some calculation time
diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
index 4008b3090e87..7554d253e5bf 100644
--- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java
+++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
@@ -599,11 +599,11 @@ public class ContainerUtil extends ContainerUtilRt {
     return res;
   }
 
-  public static <T> boolean processSortedListsInOrder(@NotNull List<T> list1,
-                                                      @NotNull List<T> list2,
-                                                      @NotNull Comparator<? super T> comparator,
-                                                      boolean mergeEqualItems,
-                                                      @NotNull Processor<T> processor) {
+  public static <T> void processSortedListsInOrder(@NotNull List<T> list1,
+                                                   @NotNull List<T> list2,
+                                                   @NotNull Comparator<? super T> comparator,
+                                                   boolean mergeEqualItems,
+                                                   @NotNull Consumer<T> processor) {
     int index1 = 0;
     int index2 = 0;
     while (index1 < list1.size() || index2 < list2.size()) {
@@ -627,15 +627,13 @@ public class ContainerUtil extends ContainerUtilRt {
           index2++;
         }
         if (c == 0 && !mergeEqualItems) {
-          if (!processor.process(e)) return false;
+          processor.consume(e);
           index2++;
           e = element2;
         }
       }
-      if (!processor.process(e)) return false;
+      processor.consume(e);
     }
-
-    return true;
   }
 
   @NotNull
@@ -645,11 +643,10 @@ public class ContainerUtil extends ContainerUtilRt {
                                              @NotNull Comparator<? super T> comparator,
                                              boolean mergeEqualItems) {
     final List<T> result = new ArrayList<T>(list1.size() + list2.size());
-    processSortedListsInOrder(list1, list2, comparator, mergeEqualItems, new Processor<T>() {
+    processSortedListsInOrder(list1, list2, comparator, mergeEqualItems, new Consumer<T>() {
       @Override
-      public boolean process(T t) {
+      public void consume(T t) {
         result.add(t);
-        return true;
       }
     });
     return result;
diff --git a/platform/util/src/com/intellij/util/text/CaseInsensitiveCharSequenceHashingStrategy.java b/platform/util/src/com/intellij/util/text/CaseInsensitiveCharSequenceHashingStrategy.java
deleted file mode 100644
index 14ac99510ac0..000000000000
--- a/platform/util/src/com/intellij/util/text/CaseInsensitiveCharSequenceHashingStrategy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2000-2017 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.util.text;
-
-import com.intellij.openapi.util.text.StringUtil;
-import gnu.trove.TObjectHashingStrategy;
-
-/**
- * @author max
- */
-public class CaseInsensitiveCharSequenceHashingStrategy implements TObjectHashingStrategy<CharSequence> {
-  public static final CaseInsensitiveCharSequenceHashingStrategy INSTANCE = new CaseInsensitiveCharSequenceHashingStrategy();
-  
-  @Override
-  public int computeHashCode(final CharSequence s) {
-    return StringUtil.stringHashCodeInsensitive(s);
-  }
-
-  @Override
-  public boolean equals(final CharSequence s1, final CharSequence s2) {
-    return StringUtil.equalsIgnoreCase(s1, s2);
-  }
-}
diff --git a/platform/util/src/com/intellij/util/text/CharSequenceSubSequence.java b/platform/util/src/com/intellij/util/text/CharSequenceSubSequence.java
index 53b9caaf44c4..1ab671e84ce2 100644
--- a/platform/util/src/com/intellij/util/text/CharSequenceSubSequence.java
+++ b/platform/util/src/com/intellij/util/text/CharSequenceSubSequence.java
@@ -64,7 +64,7 @@ public class CharSequenceSubSequence implements CharSequence, CharArrayExternali
   }
 
   @NotNull
-  public CharSequence getBaseSequence() {
+  CharSequence getBaseSequence() {
     return myChars;
   }
 
diff --git a/platform/util/src/com/intellij/util/text/CloneableTokenizer.java b/platform/util/src/com/intellij/util/text/CloneableTokenizer.java
deleted file mode 100644
index 3e1b79c9dc64..000000000000
--- a/platform/util/src/com/intellij/util/text/CloneableTokenizer.java
+++ /dev/null
@@ -1,47 +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.util.text;
-
-import java.util.StringTokenizer;
-
-/**
- * @author mike
- */
-public class CloneableTokenizer extends StringTokenizer implements Cloneable {
-  public CloneableTokenizer(String str) {
-    super(str);
-  }
-
-  public CloneableTokenizer(String str, String delim) {
-    super(str, delim);
-  }
-
-  public CloneableTokenizer(String str, String delim, boolean returnDelims) {
-    super(str, delim, returnDelims);
-  }
-
-  @Override
-  public Object clone() {
-    try {
-      return super.clone();
-    }
-    catch (CloneNotSupportedException e) {
-      e.printStackTrace();
-    }
-
-    return null;
-  }
-}
diff --git a/platform/util/src/com/intellij/util/text/ImmutableCharSequence.java b/platform/util/src/com/intellij/util/text/ImmutableCharSequence.java
index 3cc3f60863c4..cee1757e374b 100644
--- a/platform/util/src/com/intellij/util/text/ImmutableCharSequence.java
+++ b/platform/util/src/com/intellij/util/text/ImmutableCharSequence.java
@@ -25,7 +25,7 @@ public abstract class ImmutableCharSequence implements CharSequence {
     return isImmutable(cs) ? cs : cs.toString();
   }
 
-  public static boolean isImmutable(@NotNull final CharSequence cs) {
+  private static boolean isImmutable(@NotNull final CharSequence cs) {
     return cs instanceof ImmutableCharSequence ||
            cs instanceof CharSequenceSubSequence && isImmutable(((CharSequenceSubSequence)cs).getBaseSequence());
   }
diff --git a/platform/util/src/com/intellij/util/text/StringFactory.java b/platform/util/src/com/intellij/util/text/StringFactory.java
index f9298cfb2688..a3b75ea34094 100644
--- a/platform/util/src/com/intellij/util/text/StringFactory.java
+++ b/platform/util/src/com/intellij/util/text/StringFactory.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.util.text;
 
+import com.intellij.openapi.util.SystemInfo;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Constructor;
@@ -24,13 +25,16 @@ public class StringFactory {
   private static final Constructor<String> ourConstructor;
 
   static {
-    Constructor<String> constructor;
-    try {
-      constructor = String.class.getDeclaredConstructor(char[].class, boolean.class);
-      constructor.setAccessible(true);
-    }
-    catch (Throwable ignored) {
-      constructor = null; // setAccessible fails without explicit permission on Java 9
+    Constructor<String> constructor = null;
+    // makes no sense in JDK9 because new String(char[],boolean) there parses and copies array too.
+    if (!SystemInfo.IS_AT_LEAST_JAVA9) {
+      try {
+        constructor = String.class.getDeclaredConstructor(char[].class, boolean.class);
+        constructor.setAccessible(true);
+      }
+      catch (Throwable ignored) {
+        constructor = null; // setAccessible fails without explicit permission on Java 9
+      }
     }
     ourConstructor = constructor;
   }
diff --git a/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java
similarity index 91%
rename from platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java
rename to platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java
index 4e4dd765cb5b..2a49d03efb20 100644
--- a/platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/CharsetEP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2017 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,6 +15,7 @@
  */
 package com.intellij.openapi.diff.impl.patch;
 
+import com.intellij.internal.statistic.UsageTrigger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.changes.CommitContext;
@@ -48,7 +49,10 @@ public class CharsetEP implements PatchEP {
   public CharSequence provideContent(@NotNull String path, CommitContext commitContext) {
     final File file = new File(myBaseDir, path);
     final VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
-    return vf == null ? null : vf.getCharset().name();
+    if (vf == null) return null;
+    CharSequence charsetName = vf.getCharset().name();
+    UsageTrigger.trigger("Patch.CharsetEP." + charsetName);
+    return charsetName;
   }
 
   @Override
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
index fefb779a6b68..e7c883458fa0 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
@@ -23,6 +23,7 @@ import com.intellij.diff.util.Range;
 import com.intellij.openapi.progress.DumbProgressIndicator;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.LineTokenizer;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.util.BeforeAfter;
 import com.intellij.util.containers.ContainerUtil;
@@ -362,7 +363,7 @@ public class TextPatchBuilder {
   @NotNull
   private static String getRevisionName(@NotNull AirContentRevision revision) {
     String revisionName = revision.getRevisionNumber();
-    if (revisionName != null) {
+    if (!StringUtil.isEmptyOrSpaces(revisionName)) {
       return MessageFormat.format(REVISION_NAME_TEMPLATE, revisionName);
     }
     return MessageFormat.format(DATE_NAME_TEMPLATE, Long.toString(revision.getPath().lastModified()));
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java
index a0faab46be05..e7b9be09209e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java
@@ -40,14 +40,11 @@ import com.intellij.notification.NotificationType;
 import com.intellij.notification.impl.NotificationsManagerImpl;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.localVcs.UpToDateLineNumberProvider;
 import com.intellij.openapi.progress.util.BackgroundTaskUtil;
-import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.util.Key;
@@ -75,7 +72,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 
-public class AnnotateDiffViewerAction extends ToggleAction implements DumbAware {
+public class AnnotateDiffViewerAction {
   private static final Logger LOG = Logger.getInstance(AnnotateDiffViewerAction.class);
 
   private static final Key<boolean[]> ANNOTATIONS_SHOWN_KEY = Key.create("Diff.AnnotateAction.AnnotationShown");
@@ -85,19 +82,6 @@ public class AnnotateDiffViewerAction extends ToggleAction implements DumbAware
     new ThreesideAnnotatorFactory(), new TextMergeAnnotatorFactory()
   };
 
-  public AnnotateDiffViewerAction() {
-    ActionUtil.copyFrom(this, "Annotate");
-    setEnabledInModalContext(true);
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    super.update(e);
-    boolean enabled = isEnabled(e);
-    e.getPresentation().setVisible(enabled);
-    e.getPresentation().setEnabled(enabled && !isSuspended(e));
-  }
-
   @Nullable
   @SuppressWarnings("unchecked")
   private static ViewerAnnotator getAnnotator(@NotNull DiffViewerBase viewer, @NotNull Editor editor) {
@@ -166,17 +150,6 @@ public class AnnotateDiffViewerAction extends ToggleAction implements DumbAware
     }
   }
 
-  @Override
-  public boolean isSelected(AnActionEvent e) {
-    EventData data = collectEventData(e);
-    return data != null && data.annotator.isAnnotationShown();
-  }
-
-  @Override
-  public void setSelected(AnActionEvent e, boolean state) {
-    perform(e, state);
-  }
-
   private static void doAnnotate(@NotNull final ViewerAnnotator annotator) {
     final DiffViewerBase viewer = annotator.getViewer();
     final Project project = viewer.getProject();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
index ee443320f7f6..2948596ee616 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
@@ -64,6 +64,10 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware {
   public static final ExtensionPointName<Provider> EP_NAME =
     ExtensionPointName.create("com.intellij.openapi.vcs.actions.AnnotateToggleAction.Provider");
 
+  public AnnotateToggleAction() {
+    setEnabledInModalContext(true);
+  }
+
   @Override
   public void update(@NotNull AnActionEvent e) {
     super.update(e);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
index a6afff25208a..4157b87a54b6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
@@ -20,6 +20,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.AnActionExtensionProvider;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.ExtendableAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.diff.impl.patch.FilePatch;
+import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.DumbAware;
@@ -29,56 +32,96 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.VcsException;
+import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.changes.patch.CreatePatchCommitExecutor;
+import com.intellij.openapi.vcs.changes.patch.PatchWriter;
 import com.intellij.openapi.vcs.changes.shelf.ShelvedChangeList;
 import com.intellij.openapi.vcs.changes.shelf.ShelvedChangesViewManager;
 import com.intellij.openapi.vcs.changes.ui.SessionDialog;
+import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author yole
- */
-public class CreatePatchFromChangesAction extends ExtendableAction implements DumbAware {
-  private static final ExtensionPointName<AnActionExtensionProvider> EP_NAME =
-    ExtensionPointName.create("com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider");
+import static com.intellij.openapi.vcs.changes.patch.PatchWriter.writeAsPatchToClipboard;
 
-  public CreatePatchFromChangesAction() {
-    super(EP_NAME);
+public abstract class CreatePatchFromChangesAction extends ExtendableAction implements DumbAware {
+  private static final Logger LOG = Logger.getInstance(CreatePatchFromChangesAction.class);
+  private static final ExtensionPointName<AnActionExtensionProvider> EP_NAME_DIALOG =
+    ExtensionPointName.create("com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction.Dialog.ExtensionProvider");
+  private static final ExtensionPointName<AnActionExtensionProvider> EP_NAME_CLIPBOARD =
+    ExtensionPointName.create("com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction.Clipboard.ExtensionProvider");
+
+  private final boolean mySilentClipboard;
+
+  private CreatePatchFromChangesAction(boolean silentClipboard) {
+    super(silentClipboard ? EP_NAME_CLIPBOARD : EP_NAME_DIALOG);
+    mySilentClipboard = silentClipboard;
+  }
+
+  public static class Dialog extends CreatePatchFromChangesAction {
+    public Dialog() {
+      super(false);
+    }
+  }
+
+  public static class Clipboard extends CreatePatchFromChangesAction {
+    public Clipboard() {
+      super(true);
+    }
   }
 
   public void defaultActionPerformed(@NotNull AnActionEvent e) {
     Project project = e.getData(CommonDataKeys.PROJECT);
-    final Change[] changes = e.getData(VcsDataKeys.CHANGES);
-    if ((changes == null) || (changes.length == 0)) return;
-    String commitMessage = null;
-    List<ShelvedChangeList> shelvedChangeLists = ShelvedChangesViewManager.getShelvedLists(e.getDataContext());
-    if (!shelvedChangeLists.isEmpty()) {
-      commitMessage = shelvedChangeLists.get(0).DESCRIPTION;
-    }
-    else {
-      ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS);
-      if (changeLists != null && changeLists.length > 0) {
-        commitMessage = changeLists [0].getComment();
-      }
-    }
-    if (commitMessage == null) {
-      commitMessage = e.getData(VcsDataKeys.PRESET_COMMIT_MESSAGE);
-    }
-    if (commitMessage == null) {
-      commitMessage = "";
-    }
-    List<Change> changeCollection = new ArrayList<>();
-    Collections.addAll(changeCollection, changes);
-    createPatch(project, commitMessage, changeCollection);
+    Change[] changes = e.getData(VcsDataKeys.CHANGES);
+    if (ArrayUtil.isEmpty(changes)) return;
+    String commitMessage = extractCommitMessage(e);
+
+    createPatch(project, commitMessage, Arrays.asList(changes), mySilentClipboard);
   }
 
-  public static void createPatch(Project project, String commitMessage, @NotNull List<Change> changeCollection) {
+  @Nullable
+  private static String extractCommitMessage(@NotNull AnActionEvent e) {
+    String message = e.getData(VcsDataKeys.PRESET_COMMIT_MESSAGE);
+    if (message != null) return message;
+
+    List<ShelvedChangeList> shelvedChangeLists = ShelvedChangesViewManager.getShelvedLists(e.getDataContext());
+    if (!shelvedChangeLists.isEmpty()) {
+      return shelvedChangeLists.get(0).DESCRIPTION;
+    }
+
+    ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS);
+    if (changeLists != null && changeLists.length > 0) {
+      return changeLists[0].getComment();
+    }
+
+    return null;
+  }
+
+  public static void createPatch(@Nullable Project project,
+                                 @Nullable String commitMessage,
+                                 @NotNull List<Change> changes) {
+    createPatch(project, commitMessage, changes, false);
+  }
+
+  public static void createPatch(@Nullable Project project,
+                                 @Nullable String commitMessage,
+                                 @NotNull List<Change> changes,
+                                 boolean silentClipboard) {
     project = project == null ? ProjectManager.getInstance().getDefaultProject() : project;
+    if (silentClipboard) {
+      createIntoClipboard(project, changes);
+    }
+    else {
+      createWithDialog(project, commitMessage, changes);
+    }
+  }
+
+  private static void createWithDialog(@NotNull Project project, @Nullable String commitMessage, @NotNull List<Change> changes) {
     final CreatePatchCommitExecutor executor = CreatePatchCommitExecutor.getInstance(project);
     CommitSession commitSession = executor.createCommitSession();
     if (commitSession instanceof CommitSessionContextAware) {
@@ -87,21 +130,35 @@ public class CreatePatchFromChangesAction extends ExtendableAction implements Du
     DialogWrapper sessionDialog = new SessionDialog(executor.getActionText(),
                                                     project,
                                                     commitSession,
-                                                    changeCollection,
+                                                    changes,
                                                     commitMessage);
-    if (!sessionDialog.showAndGet()) {
-      return;
-    }
-    preloadContent(project, changeCollection);
+    if (!sessionDialog.showAndGet()) return;
 
-    commitSession.execute(changeCollection, commitMessage);
+    preloadContent(project, changes);
+
+    commitSession.execute(changes, commitMessage);
+  }
+
+  private static void createIntoClipboard(@NotNull Project project, @NotNull List<Change> changes) {
+    ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
+      try {
+        String base = PatchWriter.calculateBaseForWritingPatch(project, changes).getPath();
+        List<FilePatch> patches = IdeaTextPatchBuilder.buildPatch(project, changes, base, false);
+        writeAsPatchToClipboard(project, patches, base, new CommitContext());
+        VcsNotifier.getInstance(project).notifySuccess("Patch copied to clipboard");
+      }
+      catch (IOException | VcsException exception) {
+        LOG.error("Can't create patch", exception);
+        VcsNotifier.getInstance(project).notifyWeakError("Patch creation failed");
+      }
+    }, VcsBundle.message("create.patch.commit.action.progress"), true, project);
   }
 
   private static void preloadContent(final Project project, final List<Change> changes) {
     // to avoid multiple progress dialogs, preload content under one progress
     ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
       public void run() {
-        for(Change change: changes) {
+        for (Change change : changes) {
           checkLoadContent(change.getBeforeRevision());
           checkLoadContent(change.getAfterRevision());
         }
@@ -122,14 +179,14 @@ public class CreatePatchFromChangesAction extends ExtendableAction implements Du
   }
 
   public void defaultUpdate(@NotNull AnActionEvent e) {
-    final Boolean haveSelectedChanges = e.getData(VcsDataKeys.HAVE_SELECTED_CHANGES);
-    Change[] changes;
+    Boolean haveSelectedChanges = e.getData(VcsDataKeys.HAVE_SELECTED_CHANGES);
     ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS);
     List<ShelvedChangeList> shelveChangelists = ShelvedChangesViewManager.getShelvedLists(e.getDataContext());
     int changelistNum = changeLists == null ? 0 : changeLists.length;
     changelistNum += shelveChangelists.size();
 
-    e.getPresentation().setEnabled(Boolean.TRUE.equals(haveSelectedChanges) && (changelistNum == 1) &&
-                                   ((changes = e.getData(VcsDataKeys.CHANGES)) != null && changes.length > 0));
+    e.getPresentation().setEnabled(!Boolean.FALSE.equals(haveSelectedChanges) &&
+                                   changelistNum <= 1 &&
+                                   !ArrayUtil.isEmpty(e.getData(VcsDataKeys.CHANGES)));
   }
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java
index b8d538716fb1..0f1c7f37f3f5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java
@@ -42,6 +42,8 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
 
     Presentation presentation = e.getPresentation();
     presentation.setEnabled(visible);
+    presentation
+      .setText(ActionsBundle.message("action.ChangesView.RemoveChangeList.text", changeLists != null && changeLists.length > 1 ? 1 : 0));
     if (e.getPlace().equals(ActionPlaces.CHANGES_VIEW_POPUP)) {
       presentation.setVisible(visible);
     }
@@ -86,13 +88,13 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
   }
 
   private static boolean askIfShouldRemoveChangeLists(@NotNull List<? extends LocalChangeList> lists, Project project) {
-    for (LocalChangeList list : lists) {
-      if (list.isDefault()) {
-        return confirmActiveChangeListRemoval(project, lists, list.getChanges().isEmpty());
-      }
+    boolean activeChangelistSelected = lists.stream().anyMatch(LocalChangeList::isDefault);
+    boolean haveNoChanges = lists.stream().allMatch(l -> l.getChanges().isEmpty());
+
+    if (activeChangelistSelected) {
+      return confirmActiveChangeListRemoval(project, lists, haveNoChanges);
     }
 
-    boolean haveNoChanges = lists.stream().noneMatch(list -> !list.getChanges().isEmpty());
     String message = lists.size() == 1
                      ? VcsBundle.message("changes.removechangelist.warning.text", lists.get(0).getName())
                      : VcsBundle.message("changes.removechangelist.multiple.warning.text", lists.size());
@@ -107,6 +109,13 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
     List<LocalChangeList> remainingLists = ChangeListManager.getInstance(project).getChangeListsCopy();
     remainingLists.removeAll(lists);
 
+    // don't ask "Which changelist to make active" if there is only one option anyway
+    // unless there are some changes to be moved - give user a chance to cancel deletion
+    if (remainingLists.size() == 1 && empty) {
+      ChangeListManager.getInstance(project).setDefaultChangeList(remainingLists.get(0));
+      return true;
+    }
+
     String[] remainingListsNames = remainingLists.stream().map(ChangeList::getName).toArray(String[]::new);
     int nameIndex = Messages.showChooseDialog(project, empty
                                                        ? VcsBundle.message("changes.remove.active.empty.prompt")
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
index 4d249aea3634..46edc201464e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
@@ -140,7 +140,7 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr
     }
 
     @Override
-    public void execute(@NotNull Collection<Change> changes, String commitMessage) {
+    public void execute(@NotNull Collection<Change> changes, @Nullable String commitMessage) {
       PropertiesComponent.getInstance(myProject).setValue(VCS_PATCH_TO_CLIPBOARD, myPanel.isToClipboard());
       try {
         if (myPanel.isToClipboard()) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchToClipboardAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchToClipboardAction.java
deleted file mode 100644
index 3e46608bfba1..000000000000
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchToClipboardAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2000-2017 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.openapi.vcs.changes.patch;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.diff.impl.patch.FilePatch;
-import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder;
-import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.VcsBundle;
-import com.intellij.openapi.vcs.VcsDataKeys;
-import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.VcsNotifier;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.CommitContext;
-import com.intellij.util.ArrayUtil;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.intellij.openapi.vcs.changes.patch.PatchWriter.writeAsPatchToClipboard;
-
-public class CreatePatchToClipboardAction extends DumbAwareAction {
-
-  private static final Logger LOG = Logger.getInstance(CreatePatchToClipboardAction.class);
-
-  public CreatePatchToClipboardAction() {
-    super(VcsBundle.message("create.patch.to.clipboard.title"), VcsBundle.message("create.patch.to.clipboard.description"), null);
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    Project project = e.getProject();
-    e.getPresentation().setEnabled(project != null && !ArrayUtil.isEmpty(e.getData(VcsDataKeys.CHANGES)));
-  }
-
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-    final Project project = e.getRequiredData(CommonDataKeys.PROJECT);
-    final List<Change> changes = Arrays.asList(e.getRequiredData(VcsDataKeys.CHANGES));
-    ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
-      try {
-        String base = PatchWriter.calculateBaseForWritingPatch(project, changes).getPath();
-        List<FilePatch> patches = IdeaTextPatchBuilder.buildPatch(project, changes, base, false);
-        writeAsPatchToClipboard(project, patches, base, new CommitContext());
-        VcsNotifier.getInstance(project).notifySuccess("Patch copied to clipboard");
-      }
-      catch (IOException | VcsException exception) {
-        LOG.error("Can't create patch", exception);
-        VcsNotifier.getInstance(project).notifyWeakError("Patch creation failed");
-      }
-    }, VcsBundle.message("create.patch.commit.action.progress"), true, project);
-  }
-}
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
index 34ba4eaa12e1..06d4c45c44b4 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
@@ -574,7 +574,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
   }
 
   @NotNull
-  private File generateUniqueSchemePatchDir(@NotNull final String defaultName, boolean createResourceDirectory) {
+  private File generateUniqueSchemePatchDir(@Nullable final String defaultName, boolean createResourceDirectory) {
     ignoreShelfDirectoryIfFirstShelf();
     String uniqueName = UniqueNameGenerator
       .generateUniqueName(shortenAndSanitize(defaultName), mySchemeManager.getAllSchemeNames());
@@ -596,7 +596,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
 
   @NotNull
   // for create patch only
-  public static File suggestPatchName(Project project, @NotNull final String commitMessage, final File file, String extension) {
+  public static File suggestPatchName(Project project, @Nullable final String commitMessage, final File file, String extension) {
     @NonNls String defaultPath = shortenAndSanitize(commitMessage);
     while (true) {
       final File nonexistentFile = FileUtil.findSequentNonexistentFile(file, defaultPath,
@@ -612,8 +612,8 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
   }
 
   @NotNull
-  private static String shortenAndSanitize(@NotNull String commitMessage) {
-    @NonNls String defaultPath = FileUtil.sanitizeFileName(commitMessage);
+  private static String shortenAndSanitize(@Nullable String commitMessage) {
+    @NonNls String defaultPath = FileUtil.sanitizeFileName(StringUtil.notNullize(commitMessage));
     if (defaultPath.isEmpty()) {
       defaultPath = "unnamed";
     }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java
index 58bfc25191c0..f795bea52ad5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.CommitSession;
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -42,9 +43,12 @@ public class SessionDialog extends DialogWrapper {
   private final JPanel myCenterPanel = new JPanel(new BorderLayout());
   private final JComponent myConfigurationComponent;
 
-  public SessionDialog(String title, Project project,
-                       CommitSession session, List<Change> changes,
-                       String commitMessage, @Nullable JComponent configurationComponent) {
+  public SessionDialog(String title,
+                       Project project,
+                       @NotNull CommitSession session,
+                       @NotNull List<Change> changes,
+                       @Nullable String commitMessage,
+                       @Nullable JComponent configurationComponent) {
     super(project, true);
     mySession = session;
     myChanges = changes;
@@ -59,9 +63,11 @@ public class SessionDialog extends DialogWrapper {
     initValidation();
   }
 
-  public SessionDialog(String title, Project project,
-                       CommitSession session, List<Change> changes,
-                       String commitMessage) {
+  public SessionDialog(String title,
+                       Project project,
+                       @NotNull CommitSession session,
+                       @NotNull List<Change> changes,
+                       @Nullable String commitMessage) {
     this(title, project, session, changes, commitMessage, null);
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 11d19b0c6ae8..815345d99ff2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -1167,12 +1167,12 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
   }
 
   public class MyCreatePatch extends DumbAwareAction {
-    private final CreatePatchFromChangesAction myUsualDelegate;
+    private final AnAction myUsualDelegate;
 
     public MyCreatePatch() {
       super(VcsBundle.message("action.name.create.patch.for.selected.revisions"),
             VcsBundle.message("action.description.create.patch.for.selected.revisions"), AllIcons.Vcs.Patch);
-      myUsualDelegate = new CreatePatchFromChangesAction();
+      myUsualDelegate = new CreatePatchFromChangesAction.Dialog();
     }
 
     @Override
diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
index f602b7db111d..3a6fcc926c5f 100644
--- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml
+++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
@@ -38,8 +38,8 @@
 
     <diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CompareRevisionsFromHistoryActionProvider"/>
     <openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.ShowDiffWithLocalFromHistoryActionProvider"/>
-    <openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryActionProvider"/>
-    <openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.VcsLogCreatePatchActionProvider"/>
+    <openapi.vcs.changes.actions.CreatePatchFromChangesAction.Dialog.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryActionProvider$Dialog"/>
+    <openapi.vcs.changes.actions.CreatePatchFromChangesAction.Clipboard.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryActionProvider$Clipboard"/>
   </extensions>
 
   <actions>
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java
deleted file mode 100644
index 18a1b058286e..000000000000
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2000-2017 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.vcs.log.ui.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.AnActionExtensionProvider;
-import com.intellij.openapi.vcs.VcsDataKeys;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction;
-import com.intellij.vcs.log.VcsLogDataKeys;
-import com.intellij.vcs.log.impl.VcsLogUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-
-public class VcsLogCreatePatchActionProvider implements AnActionExtensionProvider {
-  @Override
-  public boolean isActive(@NotNull AnActionEvent e) {
-    return e.getData(VcsLogDataKeys.VCS_LOG_UI) != null;
-  }
-
-  @Override
-  public void update(@NotNull AnActionEvent e) {
-    Change[] changes = e.getData(VcsDataKeys.CHANGES);
-    e.getPresentation().setEnabled(changes != null && changes.length > 0);
-  }
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    VcsLogUtil.triggerUsage(e);
-
-    Change[] changes = e.getRequiredData(VcsDataKeys.CHANGES);
-    String commitMessage = e.getData(VcsDataKeys.PRESET_COMMIT_MESSAGE);
-    CreatePatchFromChangesAction.createPatch(e.getProject(), commitMessage, Arrays.asList(changes));
-  }
-}
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java
index 9cf8713b8920..2837003e7aec 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java
@@ -31,6 +31,23 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class CreatePatchFromHistoryActionProvider implements AnActionExtensionProvider {
+  private final boolean mySilentClipboard;
+
+  private CreatePatchFromHistoryActionProvider(boolean silentClipboard) {
+    mySilentClipboard = silentClipboard;
+  }
+
+  public static class Dialog extends CreatePatchFromHistoryActionProvider {
+    public Dialog() {
+      super(false);
+    }
+  }
+
+  public static class Clipboard extends CreatePatchFromHistoryActionProvider {
+    public Clipboard() {
+      super(true);
+    }
+  }
   @Override
   public boolean isActive(@NotNull AnActionEvent e) {
     return e.getData(VcsLogInternalDataKeys.FILE_HISTORY_UI) != null;
@@ -61,7 +78,7 @@ public class CreatePatchFromHistoryActionProvider implements AnActionExtensionPr
 
     ui.getVcsLog().requestSelectedDetails(detailsList -> {
       List<Change> changes = ui.collectChanges(detailsList, false);
-      CreatePatchFromChangesAction.createPatch(project, commitMessage, changes);
+      CreatePatchFromChangesAction.createPatch(project, commitMessage, changes, mySilentClipboard);
     });
   }
 }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java
index 358c122d33bb..0a068f2a260a 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java
@@ -270,7 +270,7 @@ public class MismatchedStringBuilderQueryUpdateInspection extends BaseInspection
       if (hasReferenceToVariable(variable, qualifierExpression)) {
         PsiElement parent = PsiTreeUtil.getParentOfType(expression, PsiStatement.class, PsiLambdaExpression.class);
         if (parent instanceof PsiStatement &&
-            !SideEffectChecker.mayHaveSideEffects((PsiStatement)parent, this::isSideEffectFreeBuilderMethodCall)) {
+            !SideEffectChecker.mayHaveSideEffects(parent, this::isSideEffectFreeBuilderMethodCall)) {
           return;
         }
         queried = true;
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java
index da50102920fa..661b2ce4af8b 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java
@@ -65,9 +65,9 @@ public class SideEffectChecker {
     return visitor.mayHaveSideEffects();
   }
 
-  public static boolean mayHaveSideEffects(@NotNull PsiStatement statement, Predicate<PsiMethodCallExpression> shouldIgnoreCall) {
+  public static boolean mayHaveSideEffects(@NotNull PsiElement element, Predicate<PsiMethodCallExpression> shouldIgnoreCall) {
     final SideEffectsVisitor visitor = new SideEffectsVisitor(null, shouldIgnoreCall);
-    statement.accept(visitor);
+    element.accept(visitor);
     return visitor.mayHaveSideEffects();
   }
 
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/maturity/TodoCommentInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/maturity/TodoCommentInspectionTest.java
index 12a411ba64fd..177a5f0a6d8a 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/maturity/TodoCommentInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/maturity/TodoCommentInspectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -24,10 +24,22 @@ public class TodoCommentInspectionTest extends LightInspectionTestCase {
 
   public void testNoDuplicates() {
     doTest("class A {\n" +
-           "/*TODO comment '// todo fixme'*/// todo fixme/**/\n" +
+           "// /*TODO comment 'todo fixme'*/todo fixme/**/\n" +
            "}");
   }
 
+  public void testOnlyHighlightLineWithTodo() {
+    myFixture.configureByText("X.java",
+                              "/**\n" +
+                              " * Very useful class\n" +
+                              " * <warning descr=\"TODO comment 'TODO: to be or not to be'\">TODO: to be or not to be</warning>\n" +
+                              " *\n" +
+                              " * @author turbanov\n" +
+                              " */\n" +
+                              "class WithTodo {}");
+    myFixture.testHighlighting(true, false, false);
+  }
+
   @Nullable
   @Override
   protected InspectionProfileEntry getInspection() {
diff --git a/plugins/java-decompiler/engine/README.md b/plugins/java-decompiler/engine/README.md
index 28b82dcb9a55..abc48715a5bb 100644
--- a/plugins/java-decompiler/engine/README.md
+++ b/plugins/java-decompiler/engine/README.md
@@ -1,36 +1,36 @@
-## About fernflower
+### About Fernflower
 
 Fernflower is the first actually working analytical decompiler for Java and 
 probably for a high-level programming language in general. Naturally it is still 
 under development, please send your bug reports and improvement suggestions at 
 fernflower.decompiler@gmail.com
 
+### Licence
 
-## Licence
+Fernflower is licenced under the [Apache Licence Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
-Fernflower is licenced under the Apache Licence Version 2.0. It can be found here: http://www.apache.org/licenses/LICENSE-2.0
+### Running from command line
 
-## Running from command line
+`java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>`
 
-java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
+\* means 0 or more times\
+\+ means 1 or more times
 
-* means 0 or more times
-+ means 1 or more times
-
-<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
+\<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
           Sources prefixed with -e= mean "library" files that won't be decompiled, but taken into account when analysing relationships between 
           classes or methods. Especially renaming of identifiers (s. option 'ren') can benefit from information about external classes.          
-<destination>: destination directory 
-<option>,<value>: command line option with the corresponding value, see 4.
 
-### Examples
+\<destination>: destination directory 
 
-java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\
+\<option>, \<value>: a command-line option with the corresponding value (see "Command-line options" below).
 
-java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\
+##### Examples:
 
+`java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\`
 
-## Command line options
+`java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\`
+
+### Command-line options
 
 With the exception of mpm and urc the value of 1 means the option is activated, 0 - deactivated. Default 
 value, if any, is given between parentheses.
@@ -59,18 +59,15 @@ The rest of options can be left as they are: they are aimed at professional reve
 - fdi (1): de-inline finally structures
 - mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
 - ren (0): rename ambiguous (resp. obfuscated) classes and class elements
-- urc    : full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
-         should be renamed and provides new identifier names. For more information see section 5
+- urc: full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
+         should be renamed and provides new identifier names (see "Renaming identifiers")
 - inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
 - lac (0): decompile lambda expressions to anonymous classes
 - nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
-- ind    : indentation string (default is "   " (3 spaces))
- 
-The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:
-log (INFO): possible values TRACE, INFO, WARN, ERROR
+- ind: indentation string (default is 3 spaces)
+- log (INFO): a logging level, possible values are TRACE, INFO, WARN, ERROR
 
-
-## Renaming identifiers
+### Renaming identifiers
 
 Some obfuscators give classes and their member elements short, meaningless and above all ambiguous names. Recompiling of such
 code leads to a great number of conflicts. Therefore it is advisable to let the decompiler rename elements in its turn, 
@@ -78,10 +75,10 @@ ensuring uniqueness of each identifier.
 
 Option 'ren' (i.e. -ren=1) activates renaming functionality. Default renaming strategy goes as follows:
 - rename an element if its name is a reserved word or is shorter than 3 characters
-- new names are built according to a simple pattern: (class|method|field)_<consecutive unique number>  
+- new names are built according to a simple pattern: (class|method|field)_\<consecutive unique number>  
 You can overwrite this rules by providing your own implementation of the 4 key methods invoked by the decompiler while renaming. Simply 
 pass a class that implements org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer in the option 'urc'
-(e.g. -urc=com.mypackage.MyRenamer) to Fernflower. The class must be available on the application classpath.
+(e.g. -urc=com.example.MyRenamer) to Fernflower. The class must be available on the application classpath.
 
 The meaning of each method should be clear from naming: toBeRenamed determine whether the element will be renamed, while the other three
 provide new names for classes, methods and fields respectively.  
diff --git a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
index 07e6f4de32f7..6c10c19ced37 100644
--- a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
+++ b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
@@ -26,7 +26,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
 import com.intellij.openapi.fileTypes.StdFileTypes
 import com.intellij.openapi.progress.ProcessCanceledException
-import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.DefaultProjectFactory
 import com.intellij.openapi.project.Project
@@ -88,7 +87,6 @@ class IdeaDecompiler : ClassFileDecompilers.Light() {
 
   private val myLogger = lazy { IdeaLogger() }
   private val myOptions = lazy { getOptions() }
-  private val myProgress = ContainerUtil.newConcurrentMap<VirtualFile, ProgressIndicator>()
   private val myFutures = ContainerUtil.newConcurrentMap<VirtualFile, Future<CharSequence>>()
   @Volatile private var myLegalNoticeAccepted = false
 
@@ -150,7 +148,6 @@ class IdeaDecompiler : ClassFileDecompilers.Light() {
 
     val indicator = ProgressManager.getInstance().progressIndicator
     if (indicator != null) {
-      myProgress.put(file, indicator)
       indicator.text = IdeaDecompilerBundle.message("decompiling.progress", file.name)
     }
 
@@ -191,9 +188,6 @@ class IdeaDecompiler : ClassFileDecompilers.Light() {
         throw ClassFileDecompilers.Light.CannotDecompileException(e)
       }
     }
-    finally {
-      myProgress.remove(file)
-    }
   }
 
   private class MyBytecodeProvider(private val files: Map<String, VirtualFile>) : IBytecodeProvider {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java
index cc7b27e566c3..e92d389de7c9 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java
@@ -122,7 +122,7 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio
         final TypeMigrationRules rules = new TypeMigrationRules();
         final Set<VirtualFile> virtualFiles = ContainerUtil.map2SetNotNull(myFiles, PsiFile::getVirtualFile);
         rules.setBoundScope(GlobalSearchScope.filesScope(myProject, virtualFiles));
-        final TypeMigrationLabeler labeler = new TypeMigrationLabeler(rules, toType);
+        final TypeMigrationLabeler labeler = new TypeMigrationLabeler(rules, toType, myProject);
         labeler.getMigratedUsages(false, field);
 
         for (PsiReference reference : myReferences) {
@@ -132,7 +132,7 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio
             final TypeConversionDescriptor conversion =
               myProperty.myObservableType.findDirectConversion(expression, toType, fromType);
             if (conversion != null) {
-              TypeMigrationReplacementUtil.replaceExpression(expression, myProject, conversion, new TypeEvaluator(null, null));
+              TypeMigrationReplacementUtil.replaceExpression(expression, myProject, conversion, new TypeEvaluator(null, null, myProject));
             }
           }
         }
diff --git a/python/src/com/jetbrains/python/PySearchableOptionContributor.java b/python/src/com/jetbrains/python/PySearchableOptionContributor.java
index 152ba785e0a7..f0a9e0e43726 100644
--- a/python/src/com/jetbrains/python/PySearchableOptionContributor.java
+++ b/python/src/com/jetbrains/python/PySearchableOptionContributor.java
@@ -28,7 +28,17 @@ public class PySearchableOptionContributor extends SearchableOptionContributor {
   }
 
   private static void processProjectSettings(SearchableOptionProcessor processor) {
-    processor.addOptions("Python interpreter", "Project interpreter", "Python interpreter", "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable", "Project interpreter", true);
+    String id = "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable";
+    processor.addOptions("Python interpreter", "Project interpreter", "Python interpreter",
+                         id, "Project interpreter", true);
+
+    processor.addOptions("pip package", "Project interpreter", "Project Interpreter Packages",
+                         id, "Project interpreter", true);
+
+
+    processor.addOptions("virtualenv venv", "Project interpreter", "Create VirtualEnv",
+                         id, "Project interpreter", true);
+
   }
 
   private static void processIntegratedTools(SearchableOptionProcessor processor) {
diff --git a/python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java b/python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
index 43ec7333f878..bfd56bbbc378 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
@@ -239,10 +239,6 @@ public class PyCallExpressionHelper {
    */
   public static int getImplicitArgumentCount(@NotNull final PyReferenceExpression callReference, @NotNull PyFunction function,
                                              @NotNull PyResolveContext resolveContext) {
-    final PyDecorator decorator = PsiTreeUtil.getParentOfType(callReference, PyDecorator.class);
-    if (decorator != null && PsiTreeUtil.isAncestor(decorator.getCallee(), callReference, false)) {
-      return 1;
-    }
     QualifiedResolveResult followed = callReference.followAssignmentsChain(resolveContext);
     final List<PyExpression> qualifiers = followed.getQualifiers();
     final PyExpression firstQualifier = ContainerUtil.getFirstItem(qualifiers);
diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java
index e84de500a694..df87b77b5e81 100644
--- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java
@@ -24,27 +24,30 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.changeSignature.ChangeInfo;
 import com.intellij.refactoring.changeSignature.ChangeSignatureUsageProcessor;
-import com.intellij.refactoring.changeSignature.ParameterInfo;
 import com.intellij.refactoring.rename.RenameUtil;
 import com.intellij.refactoring.rename.ResolveSnapshotProvider;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.Query;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
+import com.intellij.util.containers.JBIterable;
 import com.intellij.util.containers.MultiMap;
 import com.jetbrains.python.PyNames;
 import com.jetbrains.python.PythonLanguage;
 import com.jetbrains.python.documentation.docstrings.PyDocstringGenerator;
 import com.jetbrains.python.inspections.quickfix.PyChangeSignatureQuickFix;
 import com.jetbrains.python.psi.*;
+import com.jetbrains.python.psi.impl.PyCallExpressionHelper;
+import com.jetbrains.python.psi.impl.PyCallExpressionHelper.ArgumentMappingResults;
 import com.jetbrains.python.psi.search.PyOverridingMethodsSearch;
+import com.jetbrains.python.psi.types.TypeEvalContext;
 import com.jetbrains.python.refactoring.PyRefactoringUtil;
+import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * User : ktisha
@@ -52,10 +55,6 @@ import java.util.Set;
 
 public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProcessor {
 
-  private boolean useKeywords = false;
-  private boolean isMethod = false;
-  private boolean isAfterStar = false;
-
   @Override
   public UsageInfo[] findUsages(ChangeInfo info) {
     if (info instanceof PyChangeInfo) {
@@ -118,8 +117,9 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
         if (call instanceof PyDecorator) {
           newCall = elementGenerator.createDecoratorList("@" + builder.toString()).getDecorators()[0];
         }
-        else
+        else {
           newCall = elementGenerator.createExpressionFromText(LanguageLevel.forElement(element), builder.toString());
+        }
         call.replace(newCall);
 
         return true;
@@ -131,14 +131,14 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
     return false;
   }
 
-  private StringBuilder buildSignature(PyChangeInfo changeInfo, PyCallExpression call) {
+  @NotNull
+  private static StringBuilder buildSignature(@NotNull PyChangeInfo changeInfo, @NotNull PyCallExpression call) {
     final PyArgumentList argumentList = call.getArgumentList();
     final PyExpression callee = call.getCallee();
     String name = callee != null ? callee.getText() : changeInfo.getNewName();
     StringBuilder builder = new StringBuilder(name + "(");
     if (argumentList != null) {
-      final PyParameterInfo[] newParameters = changeInfo.getNewParameters();
-      List<String> params = collectParameters(newParameters, argumentList);
+      List<String> params = collectParameters(changeInfo, call);
       builder.append(StringUtil.join(params, ","));
     }
     builder.append(")");
@@ -146,152 +146,107 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
   }
 
 
-  private List<String> collectParameters(final PyParameterInfo[] newParameters,
-                                                @NotNull final PyArgumentList argumentList) {
-    useKeywords = false;
-    isMethod = false;
-    isAfterStar = false;
-    List<String> params = new ArrayList<>();
+  @NotNull
+  private static List<String> collectParameters(@NotNull PyChangeInfo changeInfo, @NotNull PyCallExpression call) {
+    boolean keywordArgsRequired = false;
+    final List<String> newArguments = new ArrayList<>();
 
-    int currentIndex = 0;
-    final PyExpression[] arguments = argumentList.getArguments();
+    final TypeEvalContext typeEvalContext = TypeEvalContext.userInitiated(call.getProject(), null);
+    final PyFunction function = changeInfo.getMethod();
 
-    for (PyParameterInfo info : newParameters) {
-      int oldIndex = calculateOldIndex(info);
-      final String parameterName = info.getName();
-      if (parameterName.equals(PyNames.CANONICAL_SELF) || parameterName.equals("*")) {
+    final PyParameter[] allOrigParams = function.getParameterList().getParameters();
+    final ArgumentMappingResults mapping = PyCallExpressionHelper.mapArguments(call, function, typeEvalContext);
+
+    MultiMap<Integer, PyExpression> oldParamIndexToArgs = MultiMap.create();
+    for (Map.Entry<PyExpression, PyNamedParameter> entry : mapping.getMappedParameters().entrySet()) {
+      final PyNamedParameter param = entry.getValue();
+      oldParamIndexToArgs.putValue(ArrayUtil.find(allOrigParams, param), entry.getKey());
+    }
+    assert oldParamIndexToArgs.keySet().stream().allMatch(index -> index >= 0);
+
+    PyParameterInfo[] newParamInfos = changeInfo.getNewParameters();
+    
+    final int posVarargIndex = JBIterable.of(newParamInfos).indexOf(info -> isPositionalVarargName(info.getName()));
+    final boolean posVarargEmpty = posVarargIndex != -1 && oldParamIndexToArgs.get(newParamInfos[posVarargIndex].getOldIndex()).isEmpty();
+    for (int paramIndex = 0; paramIndex < newParamInfos.length; paramIndex++) {
+      PyParameterInfo info = newParamInfos[paramIndex];
+      final String paramName = info.getName();
+      final boolean isKeywordVararg = isKeywordVarargName(paramName);
+      final boolean isPositionalVararg = isPositionalVarargName(paramName);
+      if (paramName.equals(PyNames.CANONICAL_SELF)) {
         continue;
       }
-
-      if (parameterName.startsWith("**")) {
-        currentIndex = addKwArgs(params, arguments, currentIndex);
+      if (paramName.equals("*")) {
+        keywordArgsRequired = true;
+        continue;
       }
-      else if (parameterName.startsWith("*")) {
-        currentIndex = addPositionalContainer(params, arguments, currentIndex);
-      }
-      else if (oldIndex < 0) {
-        addNewParameter(params, info);
-        currentIndex += 1;
+      final String paramDefault = StringUtil.notNullize(info.getDefaultValue());
+      final int oldIndex = info.getOldIndex();
+      if (oldIndex < 0) {
+        if (!info.getDefaultInSignature()) {
+          newArguments.add(formatArgument(paramName, paramDefault, keywordArgsRequired));
+        }
+        else {
+          // If the next argument was passed by position it would match with this new default. 
+          // Imagine "def f(x, y=None): ..." -> "def f(x, foo=None, y=None): ..." and a call "f(1, 2)" 
+          keywordArgsRequired = true;
+        }
       }
       else {
-        currentIndex = moveParameter(params, argumentList, info, currentIndex, oldIndex, arguments);
+        final Collection<PyExpression> existingArgs = oldParamIndexToArgs.get(oldIndex);
+        if (!existingArgs.isEmpty()) {
+          for (PyExpression arg : existingArgs) {
+            PyExpression argValue;
+            String argName;
+            if (arg instanceof PyKeywordArgument) {
+              argValue = ((PyKeywordArgument)arg).getValueExpression();
+              argName = StringUtil.notNullize(((PyKeywordArgument)arg).getKeyword());
+            }
+            else {
+              argValue = arg;
+              argName = "";
+            }
+            // Keep format of existing keyword arguments unless it's illegal in their new position
+            if (!argName.isEmpty() && !(paramIndex < posVarargIndex && !posVarargEmpty)) {
+              keywordArgsRequired = true;
+            }
+            assert !(isPositionalVararg && keywordArgsRequired);
+            final String argValueText = argValue != null ? argValue.getText() : "";
+            final String newArgumentName = isKeywordVararg ? argName : paramName;
+            newArguments.add(formatArgument(newArgumentName, argValueText, keywordArgsRequired));
+          }
+        }
+        else if (!info.getDefaultInSignature() && !isPositionalVararg && !isKeywordVararg) {
+          // Existing ordinary parameter without default value. Perhaps, the default value was propagated to calls 
+          newArguments.add(formatArgument(paramName, paramDefault, keywordArgsRequired));
+        }
+      }
+      // Keyword-only arguments should follow (Python 3) 
+      if (isPositionalVararg) {
+        keywordArgsRequired = true;
       }
     }
-    return params;
+    return newArguments;
   }
 
-  private int calculateOldIndex(ParameterInfo info) {
-    if (info.getName().equals(PyNames.CANONICAL_SELF)) {
-      isMethod = true;
-    }
-    if (info.getName().equals("*")) {
-      isAfterStar = true;
-      useKeywords = true;
-    }
-    int oldIndex = info.getOldIndex();
-    oldIndex = isMethod ? oldIndex - 1 : oldIndex;
-    oldIndex = isAfterStar ? oldIndex - 1 : oldIndex;
-    return oldIndex;
+  private static boolean isPositionalVarargName(@NotNull String paramName) {
+    return !isKeywordVarargName(paramName) && !paramName.equals("*") && paramName.startsWith("*");
   }
 
-
-  private static int addPositionalContainer(List<String> params,
-                                            PyExpression[] arguments,
-                                            int index) {
-    for (int i = index; i != arguments.length; ++i) {
-      if (!(arguments[i] instanceof PyKeywordArgument)) {
-        params.add(arguments[i].getText());
-        index += 1;
-      }
-    }
-    return index;
+  private static boolean isKeywordVarargName(@NotNull String paramName) {
+    return paramName.startsWith("**");
   }
 
-  private static int addKwArgs(List<String> params, PyExpression[] arguments, int index) {
-    for (int i = index; i < arguments.length; ++i) {
-      if (arguments[i] instanceof PyKeywordArgument) {
-        params.add(arguments[i].getText());
-        index += 1;
-      }
-    }
-    return index;
-  }
-
-  private void addNewParameter(List<String> params, PyParameterInfo info) {
-    if (info.getDefaultInSignature()) {
-      useKeywords = true;
+  @NotNull
+  private static String formatArgument(@NotNull String name, @NotNull String value, boolean keywordArgument) {
+    if (keywordArgument) {
+      return name + "=" + value;
     }
     else {
-      params.add(useKeywords ? info.getName() + " = " + info.getDefaultValue() : info.getDefaultValue());
+      return value;
     }
   }
 
-  /**
-   * @return current index in argument list
-   */
-  private int moveParameter(List<String> params,
-                             PyArgumentList argumentList,
-                             PyParameterInfo info,
-                             int currentIndex,
-                             int oldIndex,
-                             PyExpression[] arguments) {
-    final String paramName = info.getOldName();
-    final PyKeywordArgument keywordArgument = argumentList.getKeywordArgument(paramName);
-    if (keywordArgument != null) {
-      params.add(keywordArgument.getText());
-      useKeywords = true;
-      return currentIndex + 1;
-    }
-    else if (currentIndex < arguments.length) {
-      final PyExpression currentParameter = arguments[currentIndex];
-      if (currentParameter instanceof PyKeywordArgument && info.isRenamed()) {
-        params.add(currentParameter.getText());
-      }
-      else if (oldIndex < arguments.length && (
-        !(info.getDefaultInSignature() && arguments[oldIndex].getText().equals(info.getDefaultValue())) || !(currentParameter instanceof PyKeywordArgument))) {
-        return addOldPositionParameter(params, arguments[oldIndex], info, currentIndex);
-      }
-      else
-        return currentIndex;
-    }
-    else if (oldIndex < arguments.length) {
-      return addOldPositionParameter(params, arguments[oldIndex], info, currentIndex);
-    }
-    else if (!info.getDefaultInSignature()) {
-      params.add( useKeywords ? paramName + " = " + info.getDefaultValue()
-                              : info.getDefaultValue());
-    }
-    else {
-      useKeywords = true;
-      return currentIndex;
-    }
-    return currentIndex + 1;
-  }
-
-  private int addOldPositionParameter(List<String> params,
-                                      PyExpression argument,
-                                      PyParameterInfo info, int currentIndex) {
-    final String paramName = info.getName();
-    if (argument instanceof PyKeywordArgument) {
-      final PyExpression valueExpression = ((PyKeywordArgument)argument).getValueExpression();
-
-      if (!paramName.equals(argument.getName()) && !StringUtil.isEmptyOrSpaces(info.getDefaultValue())) {
-        if (!info.getDefaultInSignature())
-          params.add(useKeywords ? info.getName() + " = " + info.getDefaultValue() : info.getDefaultValue());
-        else
-          return currentIndex;
-      }
-      else {
-        params.add(valueExpression == null ? paramName : paramName + " = " + valueExpression.getText());
-        useKeywords = true;
-      }
-    }
-    else {
-      params.add(useKeywords && !argument.getText().equals(info.getDefaultValue())? paramName + " = " + argument.getText() : argument.getText());
-    }
-    return currentIndex + 1;
-  }
-
   private static boolean isPythonUsage(UsageInfo info) {
     final PsiElement element = info.getElement();
     if (element == null) return false;
diff --git a/python/testData/refactoring/changeSignature/addDefaultParam.after.py b/python/testData/refactoring/changeSignature/addDefaultParamAtEnd.after.py
similarity index 100%
rename from python/testData/refactoring/changeSignature/addDefaultParam.after.py
rename to python/testData/refactoring/changeSignature/addDefaultParamAtEnd.after.py
diff --git a/python/testData/refactoring/changeSignature/addDefaultParam.before.py b/python/testData/refactoring/changeSignature/addDefaultParamAtEnd.before.py
similarity index 100%
rename from python/testData/refactoring/changeSignature/addDefaultParam.before.py
rename to python/testData/refactoring/changeSignature/addDefaultParamAtEnd.before.py
diff --git a/python/testData/refactoring/changeSignature/addDefaultParam1.after.py b/python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.after.py
similarity index 81%
rename from python/testData/refactoring/changeSignature/addDefaultParam1.after.py
rename to python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.after.py
index 60e751258f65..8c8998322057 100644
--- a/python/testData/refactoring/changeSignature/addDefaultParam1.after.py
+++ b/python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.after.py
@@ -5,3 +5,4 @@ def foo(a, d=1, b=None):
 foo("a", b="b")
 foo("a")
 foo("a", b="b")
+foo("a", b=None)
diff --git a/python/testData/refactoring/changeSignature/addDefaultParam1.before.py b/python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.before.py
similarity index 81%
rename from python/testData/refactoring/changeSignature/addDefaultParam1.before.py
rename to python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.before.py
index 2db5e004d5a7..6d39c6afdecc 100644
--- a/python/testData/refactoring/changeSignature/addDefaultParam1.before.py
+++ b/python/testData/refactoring/changeSignature/addDefaultParamBeforeAnotherDefault.before.py
@@ -4,3 +4,4 @@ def foo(a, b=None):
 foo("a", "b")
 foo("a")
 foo("a", b="b")
+foo("a", None)
diff --git a/python/testData/refactoring/changeSignature/addParameterBeforeVararg.after.py b/python/testData/refactoring/changeSignature/addParameterBeforeVararg.after.py
new file mode 100644
index 000000000000..3be7972e63eb
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/addParameterBeforeVararg.after.py
@@ -0,0 +1,5 @@
+def f(x, *args):
+    pass
+
+
+f(42, 1, 2)
diff --git a/python/testData/refactoring/changeSignature/addParameterBeforeVararg.before.py b/python/testData/refactoring/changeSignature/addParameterBeforeVararg.before.py
new file mode 100644
index 000000000000..14f338de8d7d
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/addParameterBeforeVararg.before.py
@@ -0,0 +1,5 @@
+def f(*args):
+    pass
+
+
+f(1, 2)
diff --git a/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.after.py b/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.after.py
new file mode 100644
index 000000000000..69d4c9689a3d
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.after.py
@@ -0,0 +1,5 @@
+def f(y, x, *args):
+    pass
+
+
+f(1, x=42)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.before.py b/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.before.py
new file mode 100644
index 000000000000..25073f4b4887
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keepKeywordOfArgumentBeforeEmptyVararg.before.py
@@ -0,0 +1,5 @@
+def f(y, *args, x):
+    pass
+
+
+f(1, x=42)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/keywordOnlyParameter.after.py b/python/testData/refactoring/changeSignature/keywordOnlyParameter.after.py
new file mode 100644
index 000000000000..ccfdc6f38a3b
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keywordOnlyParameter.after.py
@@ -0,0 +1,5 @@
+def f1(x, *args, foo):
+    pass
+
+
+f1(42, 'spam', foo=None)
diff --git a/python/testData/refactoring/changeSignature/keywordOnlyParameter.before.py b/python/testData/refactoring/changeSignature/keywordOnlyParameter.before.py
new file mode 100644
index 000000000000..87e1a321e804
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keywordOnlyParameter.before.py
@@ -0,0 +1,5 @@
+def f1(x, *args):
+    pass
+
+
+f1(42, 'spam')
diff --git a/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.after.py b/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.after.py
new file mode 100644
index 000000000000..df736455ce21
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.after.py
@@ -0,0 +1,5 @@
+def f(x, foo=None, **kwargs):
+    pass
+
+
+f(42, foo='spam')
diff --git a/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.before.py b/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.before.py
new file mode 100644
index 000000000000..5ddd241d153c
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/keywordParameterAlreadyExists.before.py
@@ -0,0 +1,5 @@
+def f(x, **kwargs):
+    pass
+
+
+f(42, foo='spam')
diff --git a/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.after.py b/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.after.py
new file mode 100644
index 000000000000..162a8dd2bb2e
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.after.py
@@ -0,0 +1,5 @@
+def f(y, x, *args):
+    pass
+
+
+f(1, 42, 2, 3)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.before.py b/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.before.py
new file mode 100644
index 000000000000..18e377b24f33
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/removeKeywordFromArgumentBeforeVararg.before.py
@@ -0,0 +1,5 @@
+def f(y, *args, x):
+    pass
+
+
+f(1, 2, 3, x=42)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.after.py b/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.after.py
new file mode 100644
index 000000000000..f0432d02eed4
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.after.py
@@ -0,0 +1,5 @@
+def func(x, *args):
+    pass
+
+
+func(1, 3)
diff --git a/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.before.py b/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.before.py
new file mode 100644
index 000000000000..a3969b8e974b
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/removeParameterBeforeVararg.before.py
@@ -0,0 +1,5 @@
+def func(x, y, *args):
+    pass
+
+
+func(1, 2, 3)
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.after.py
new file mode 100644
index 000000000000..aa334b398f1b
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.after.py
@@ -0,0 +1,5 @@
+def f(x, foo, y, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, foo=None, y=None, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.before.py
new file mode 100644
index 000000000000..4ac3e89d0cbd
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfter.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.after.py
new file mode 100644
index 000000000000..cf433733ef2e
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.after.py
@@ -0,0 +1,5 @@
+def f(x, foo, y=None, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, foo=None, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.before.py
new file mode 100644
index 000000000000..4ac3e89d0cbd
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsAddParamAfterWithDefault.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.after.py
new file mode 100644
index 000000000000..16d0d0492f73
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.after.py
@@ -0,0 +1,5 @@
+def f(x, **kwargs):
+    pass
+
+
+f(42, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.before.py
new file mode 100644
index 000000000000..bdd1219eff7d
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParam.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    pass
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.after.py
new file mode 100644
index 000000000000..aa696b46a2d4
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.after.py
@@ -0,0 +1,5 @@
+def f(foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(foo=None, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.before.py
new file mode 100644
index 000000000000..4ac3e89d0cbd
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRemoveParamBefore.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.after.py
new file mode 100644
index 000000000000..eebe9b436cfe
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.after.py
@@ -0,0 +1,5 @@
+def f(x, bar, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, bar=None, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.before.py
new file mode 100644
index 000000000000..4ac3e89d0cbd
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsRenameParam.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.after.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.after.py
new file mode 100644
index 000000000000..c7bd830afe11
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.after.py
@@ -0,0 +1,5 @@
+def f(foo, x, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, x=None, extra1=1, extra2=2)
\ No newline at end of file
diff --git a/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.before.py b/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.before.py
new file mode 100644
index 000000000000..4ac3e89d0cbd
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/scatteredKwargsArgsSwapParams.before.py
@@ -0,0 +1,5 @@
+def f(x, foo, **kwargs):
+    print(foo, kwargs)
+
+
+f(42, extra1=1, foo=None, extra2=2)
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
index b93694e286b4..dfd00af2d4c3 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
@@ -72,11 +72,17 @@ public class PyChangeSignatureTest extends PyTestCase {
                                               new PyParameterInfo(-1, "c", "3", false)));
   }
 
-  public void testAddDefaultParam() {
+  public void testAddDefaultParamAtEnd() {
     doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "a", null, false), new PyParameterInfo(1, "b", null, false),
                                               new PyParameterInfo(-1, "c", "3", true)));
   }
 
+  // PY-24607
+  public void testAddDefaultParamBeforeAnotherDefault() {
+    doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "a", null, false), new PyParameterInfo(-1, "d", "1", true),
+                                              new PyParameterInfo(1, "b", "None", true)));
+  }
+
   public void testRemoveDefaultFromParam() {
     doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "a", null, false), new PyParameterInfo(1, "b", "2", false)));
   }
@@ -88,11 +94,6 @@ public class PyChangeSignatureTest extends PyTestCase {
     doValidationTest(null, Arrays.asList(first, second), PyBundle.message("refactoring.change.signature.dialog.validation.default.missing"));
   }
 
-  public void testAddDefaultParam1() {
-    doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "a", null, false), new PyParameterInfo(-1, "d", "1", true),
-                                              new PyParameterInfo(1, "b", "None", true)));
-  }
-
   public void testUpdateDocstring() {
     getIndentOptions().INDENT_SIZE = 2;
     final PyParameterInfo a = new PyParameterInfo(0, "a", null, false);
@@ -303,6 +304,90 @@ public class PyChangeSignatureTest extends PyTestCase {
                           LanguageLevel.PYTHON35);
   }
 
+  // PY-24288
+  public void testKeywordParameterAlreadyExists() {
+    doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                              new PyParameterInfo(-1, "foo", "None", true),
+                                              new PyParameterInfo(1, "**kwargs", null, false)));
+  }
+
+  // PY-24480
+  public void testAddParameterBeforeVararg() {
+    doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(-1, "x", "42", false),
+                                              new PyParameterInfo(0, "*args", null, false)));
+  }
+
+  // PY-24479
+  public void testRemoveParameterBeforeVararg() {
+    doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                              new PyParameterInfo(2, "*args", null, false)));
+  }
+
+  // PY-16683
+  public void testKeywordOnlyParameter() {
+    runWithLanguageLevel(LanguageLevel.PYTHON30, () -> {
+      doChangeSignatureTest(null, Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                                new PyParameterInfo(1, "*args", null, false),
+                                                new PyParameterInfo(-1, "foo", "None", false)));
+    });
+  }
+
+  // PY-24602
+  public void testScatteredKwargsArgsRemoveParam() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+
+  // PY-24602
+  public void testScatteredKwargsArgsRenameParam() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                             new PyParameterInfo(1, "bar", null, false),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+
+  // PY-24602
+  public void testScatteredKwargsArgsRemoveParamBefore() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(1, "foo", null, false),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+  
+  // PY-24602
+  public void testScatteredKwargsArgsAddParamAfter() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                             new PyParameterInfo(1, "foo", null, false),
+                                             new PyParameterInfo(-1, "y", "None", false),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+  
+  // PY-24602
+  public void testScatteredKwargsArgsAddParamAfterWithDefault() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "x", null, false),
+                                             new PyParameterInfo(1, "foo", null, false),
+                                             new PyParameterInfo(-1, "y", "None", true),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+  
+  // PY-24602
+  public void testScatteredKwargsArgsSwapParams() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "foo", null, false),
+                                             new PyParameterInfo(1, "x", null, false),
+                                             new PyParameterInfo(2, "**kwargs", null, false)));
+  }
+
+  // PY-24609
+  public void testRemoveKeywordFromArgumentBeforeVararg() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "y", null, false),
+                                             new PyParameterInfo(2, "x", null, false),
+                                             new PyParameterInfo(1, "*args", null, false)));
+  }
+  
+  // PY-24609
+  public void testKeepKeywordOfArgumentBeforeEmptyVararg() {
+    doChangeSignatureTest("f", Arrays.asList(new PyParameterInfo(0, "y", null, false),
+                                             new PyParameterInfo(2, "x", null, false),
+                                             new PyParameterInfo(1, "*args", null, false)));
+  }
+
   public void doChangeSignatureTest(@Nullable String newName, @Nullable List<PyParameterInfo> parameters) {
     myFixture.configureByFile("refactoring/changeSignature/" + getTestName(true) + ".before.py");
     changeSignature(newName, parameters);
@@ -355,7 +440,7 @@ public class PyChangeSignatureTest extends PyTestCase {
     final PyFunction newFunction = PyChangeSignatureHandler.getSuperMethod(function);
     assertNotNull(newFunction);
     final PyMethodDescriptor method = new PyMethodDescriptor(newFunction);
-    final TestPyChangeSignatureDialog dialog = new TestPyChangeSignatureDialog(newFunction.getProject(), method);
+    final TestPyChangeSignatureDialog dialog = new TestPyChangeSignatureDialog(newFunction.getProject(), method);                                                                                                                                                                                                     
     try {
       if (newName != null) {
         dialog.setNewName(newName);
diff --git a/resources-en/src/inspectionDescriptions/Java8MapApi.html b/resources-en/src/inspectionDescriptions/Java8MapApi.html
index fccdc8d4cff3..261992dc44ce 100644
--- a/resources-en/src/inspectionDescriptions/Java8MapApi.html
+++ b/resources-en/src/inspectionDescriptions/Java8MapApi.html
@@ -28,6 +28,9 @@ Reports calls to <code>Map.get()</code> which could be replaced with <code>getOr
   </li>
 
 </ul>
+<p>Note that replacement with <code>computeIfAbsent()</code> or <code>merge()</code> may work incorrectly for some <code>Map</code>
+implementations if the code extracted to lambda expression modifies the same <code>Map</code>. By default,
+warning is not issued if this code may have side effects. If desired, use the last checkbox to issue warning always.</p>
 <!-- tooltip end -->
 <p>This inspection only reports if the project or module is configured to use a language level of 8 or higher.</p>
 <p><small>New in 2016.3</small></p>
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/TypeOrElementOrAttributeReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/TypeOrElementOrAttributeReference.java
index 0c3687cf0ea0..77d5cf138068 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/TypeOrElementOrAttributeReference.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/TypeOrElementOrAttributeReference.java
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.ResolveCache;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlFile;
@@ -124,15 +123,13 @@ public class TypeOrElementOrAttributeReference implements PsiReference {
   @Override
   @Nullable
   public PsiElement resolve() {
-    final PsiElement psiElement = ResolveCache
-      .getInstance(getElement().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, false, false);
-
-    return psiElement != PsiUtilCore.NULL_PSI_ELEMENT ? psiElement:null;
+    return ResolveCache.getInstance(getElement().getProject())
+      .resolveWithCaching(this, (ref, incompleteCode) -> ref.resolveInner(), false, false);
   }
 
   private PsiElement resolveInner() {
     final XmlTag tag = PsiTreeUtil.getContextOfType(myElement, XmlTag.class, false);
-    if (tag == null) return PsiUtilCore.NULL_PSI_ELEMENT;
+    if (tag == null) return null;
 
     String canonicalText = getCanonicalText();
     boolean[] redefined = new boolean[1];
@@ -150,7 +147,7 @@ public class TypeOrElementOrAttributeReference implements PsiReference {
             true
           );
 
-          return descriptor != null ? descriptor.getDeclaration(): PsiUtilCore.NULL_PSI_ELEMENT;
+          return descriptor != null ? descriptor.getDeclaration(): null;
         }
         case AttributeReference: {
           //final String prefixByQualifiedName = XmlUtil.findPrefixByQualifiedName(canonicalText);
@@ -163,7 +160,7 @@ public class TypeOrElementOrAttributeReference implements PsiReference {
 
           if (descriptor != null) return descriptor.getDeclaration();
 
-          return PsiUtilCore.NULL_PSI_ELEMENT;
+          return null;
         }
         case TypeReference: {
           TypeDescriptor typeDescriptor = redefined[0] ? nsDescriptor.findTypeDescriptor(XmlUtil.findLocalNameByQualifiedName(canonicalText), "") :
@@ -177,7 +174,7 @@ public class TypeOrElementOrAttributeReference implements PsiReference {
       }
     }
 
-    return PsiUtilCore.NULL_PSI_ELEMENT;
+    return null;
   }
 
   XmlNSDescriptorImpl getDescriptor(final XmlTag tag, String text, boolean[] redefined) {
@@ -377,13 +374,7 @@ public class TypeOrElementOrAttributeReference implements PsiReference {
     return false;
   }
 
-  private static class MyResolver implements ResolveCache.Resolver {
-    static final MyResolver INSTANCE = new MyResolver();
-    @Override
-    public PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) {
-      return ((TypeOrElementOrAttributeReference)ref).resolveInner();
-    }
-  }
+  static final ResolveCache.Resolver RESOLVER = (ref, incompleteCode) -> ((TypeOrElementOrAttributeReference)ref).resolveInner();
 
   private static class CompletionProcessor implements PsiElementProcessor<XmlTag> {
     final List<String> myElements = new ArrayList<>(1);