diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml
new file mode 100644
index 00000000000..122b0d6c6f0
--- /dev/null
+++ b/.idea/libraries/hamcrest_core_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="hamcrest-core-1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 977f58330a4..21f7741be23 100644
--- a/build.xml
+++ b/build.xml
@@ -357,6 +357,7 @@
 
             <else>
                 <available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar"/>
+                <available property="jssejar" value="${java.home}/lib/jsse.jar" file="${java.home}/lib/jsse.jar"/>
                 <available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar"/>
 
                 <proguard><![CDATA[
@@ -396,6 +397,7 @@
                     -dontwarn org.objectweb.asm.** # this is ASM3, the old version that we do not use
 
                     -libraryjars '${rtjar}'
+                    -libraryjars '${jssejar}'
                     -libraryjars '${bootstrap.runtime}'
 
                     -target 1.6
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
index ba2918ac30b..112e847f19a 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
@@ -67,8 +67,10 @@ public class MockPsiDocumentManager extends PsiDocumentManager {
     public void commitDocument(@NotNull Document document) {
     }
 
+    @NotNull
+    @Override
     public CharSequence getLastCommittedText(@NotNull Document document) {
-        return document.getText();
+        return document.getImmutableCharSequence();
     }
 
     @Override
diff --git a/compiler/testData/asJava/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/nullabilityAnnotations/Generic.java
index 3c79a6cfc57..068c72311df 100644
--- a/compiler/testData/asJava/nullabilityAnnotations/Generic.java
+++ b/compiler/testData/asJava/nullabilityAnnotations/Generic.java
@@ -1,4 +1,4 @@
-public interface Generic <N, NN>  extends jet.JetObject {
+public interface Generic <N, NN> extends jet.JetObject {
     N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
 
     @org.jetbrains.annotations.NotNull
diff --git a/compiler/testData/resolve/ResolveToJava2.resolve b/compiler/testData/resolve/ResolveToJava2.resolve
index 4d737199b51..5f368d4abf8 100644
--- a/compiler/testData/resolve/ResolveToJava2.resolve
+++ b/compiler/testData/resolve/ResolveToJava2.resolve
@@ -8,7 +8,7 @@ import java.`java::java.util`util.*
 fun <T> t(t : T) : T {
   `c`c(java.lang.Integer(1))
   System.out.`java::java.io.PrintStream.print(Object)`print(t)
-  System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray?)
+  System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray)
   System.out.`java::java.io.PrintStream.print(Object)`print(null : Object?)
   System.out.`java::java.io.PrintStream.print(Int)`print(1)
   System.out.`java::java.io.PrintStream.print(Double)`print(1.0)
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 5f6223ab34d..775bff33f7b 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
+    <orderEntry type="library" name="hamcrest-core-1.3" level="project" />
   </component>
 </module>
 
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java
index 59b87d71627..8012ec5a0bd 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java
@@ -78,6 +78,9 @@ public class IdeaJdkAnnotationsReflectedTest extends KotlinTestWithEnvironment {
         for (FqName classFqName : JdkAnnotationsValidityTest.getAffectedClasses("jar://ideaSDK/lib/jdkAnnotations.jar!/")) {
             if (new FqName("org.jdom").equals(classFqName.parent())) continue; // filter unrelated jdom annotations
             if (new FqName("java.util.concurrent.TransferQueue").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.util.Objects").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.nio.file.Files").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.nio.file.Paths").equals(classFqName)) continue; // filter JDK7-specific class
             // the following idea annotation is incorrect
             // <item name="java.io.StringWriter void write(java.lang.String) 0">
             // <annotation name="org.jetbrains.annotations.NotNull" />
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 479dea6fa9f..bc7f96439be 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="133.0" until-build="134.0"/>
+  <idea-version since-build="134.0" until-build="134.1010"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
index 73250c59994..dfe29f0dbe1 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.plugin.k2jsrun;
 
 import com.intellij.ide.browsers.BrowsersConfiguration;
+import com.intellij.ide.browsers.WebBrowserManager;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,7 +32,7 @@ public final class K2JSConfigurationSettings {
     private boolean shouldOpenInBrowserAfterTranslation = false;
 
     @NotNull
-    private BrowsersConfiguration.BrowserFamily browserFamily = BrowsersConfiguration.getInstance().getActiveBrowsers().get(0);
+    private BrowsersConfiguration.BrowserFamily browserFamily = WebBrowserManager.getInstance().getActiveBrowsers().get(0).getFamily();
 
     public K2JSConfigurationSettings(@NotNull Project project) {
         String basePath = project.getBasePath();
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
index 99599f7e5de..0cf6d262374 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
@@ -17,6 +17,8 @@
 package org.jetbrains.jet.plugin.k2jsrun;
 
 import com.intellij.ide.browsers.BrowsersConfiguration;
+import com.intellij.ide.browsers.WebBrowser;
+import com.intellij.ide.browsers.WebBrowserManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -137,8 +139,8 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor<K2JSRunConf
     }
 
     private void setUpBrowserCombobox() {
-        for (BrowsersConfiguration.BrowserFamily family : BrowsersConfiguration.getInstance().getActiveBrowsers()) {
-            browserComboBox.addItem(family);
+        for (WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) {
+            browserComboBox.addItem(browser.getFamily());
         }
         browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>() {
             @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
index 27422e93fdc..7e887d674b1 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates;
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.template.TemplateContextType;
-import com.intellij.codeInsight.template.impl.LiveTemplateLookupElement;
-import com.intellij.codeInsight.template.impl.TemplateImpl;
-import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
-import com.intellij.codeInsight.template.impl.TemplateSettings;
+import com.intellij.codeInsight.template.impl.*;
 import com.intellij.openapi.util.Ref;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PlatformPatterns;
@@ -86,7 +83,7 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
         if (!templatesShown.get()) {
             templatesShown.set(true);
             for (TemplateImpl possible : templates) {
-                result.addElement(new LiveTemplateLookupElement(possible, false));
+                result.addElement(new LiveTemplateLookupElementImpl(possible, false));
             }
         }
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
index 8f80efa6834..db581fdc2fd 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
@@ -120,10 +120,6 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetE
                                 }
                                 SpecifyTypeExplicitlyAction.addTypeAnnotation(myProject, myEditor, myProperty, myExprType);
                                 PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
-                                TemplateState templateState = TemplateManagerImpl.getTemplateState(myEditor);
-                                if (templateState != null) {
-                                    templateState.doReformat(myProperty.getTextRange());
-                                }
                             }
                             else {
                                 SpecifyTypeExplicitlyAction.removeTypeAnnotation(myProperty);
diff --git a/idea/testData/completion/basic/java/PropertyMetadata.kt b/idea/testData/completion/basic/java/PropertyMetadata.kt
index 89a6a979b97..db34ef702a1 100644
--- a/idea/testData/completion/basic/java/PropertyMetadata.kt
+++ b/idea/testData/completion/basic/java/PropertyMetadata.kt
@@ -8,4 +8,5 @@ fun firstFun() {
 // INVOCATION_COUNT: 1
 // EXIST: { lookupString:"PropertyMetadata", itemText:"PropertyMetadata", tailText:" (jet)" }
 // EXIST: { lookupString:"PropertyMetadataImpl", itemText:"PropertyMetadataImpl", tailText:" (jet)" }
-// NUMBER: 2
+// EXIST: {"lookupString":"PropertyMetadata$$TImpl","tailText":" (jet)","typeText":"","itemText":"PropertyMetadata$$TImpl"}
+// NUMBER: 3
diff --git a/idea/testData/completion/injava/ClassesFromNamespace.java b/idea/testData/completion/injava/ClassesFromNamespace.java
index 7a2f7d6ae83..5190bbe4c10 100644
--- a/idea/testData/completion/injava/ClassesFromNamespace.java
+++ b/idea/testData/completion/injava/ClassesFromNamespace.java
@@ -10,5 +10,4 @@ public class Testing {
 // EXIST: LibTrait
 // EXIST: LibEnum
 // EXIST: LibObject
-// EXIST: FooPackage
-// NUMBER: 5
+// EXIST: FooPackage
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
index 418a8bf4c2d..e2533a0dcec 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
@@ -1,5 +1,4 @@
 Unclassified usage (1: 19) public open class X: A()
 Unclassified usage (3: 14) public trait T: A
 Unclassified usage (5: 19) public open class Y: X()
-Unclassified usage (7: 14) public class Z: Y(), T
-Unclassified usage (7: 14) public class Z: Y(), T
+Unclassified usage (7: 14) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
index 61f1193f5e0..e2b3a4004ec 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
@@ -1,5 +1,4 @@
 Unclassified usage (2: 23) public open class X: A()
 Unclassified usage (4: 18) public trait T: A
 Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
-Unclassified usage (9: 22) public class Z: Y(), T
+Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
index 61f1193f5e0..e2b3a4004ec 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
@@ -1,5 +1,4 @@
 Unclassified usage (2: 23) public open class X: A()
 Unclassified usage (4: 18) public trait T: A
 Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
-Unclassified usage (9: 22) public class Z: Y(), T
+Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
index 4db6f1d150e..d425b40ce69 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
@@ -1,4 +1,3 @@
 Unclassified usage (1: 19) public open class X: A
 Unclassified usage (5: 19) public open class Y: X()
-Unclassified usage (7: 14) public class Z: Y(), T
-Unclassified usage (7: 14) public class Z: Y(), T
+Unclassified usage (7: 14) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
index 440c28a4a59..f2abff9989c 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
@@ -1,4 +1,3 @@
 Unclassified usage (2: 23) public open class X: A
 Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
-Unclassified usage (9: 22) public class Z: Y(), T
+Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
index e7ad2a429c3..719e8fccda6 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
@@ -130,8 +130,8 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
         val lookup = (fixture.getLookup() as LookupImpl)
         lookup.setCurrentItem(item)
         if (LookupEvent.isSpecialCompletionChar(completionChar)) {
-            (object : WriteCommandAction.Simple(getProject()) {
-                protected override fun run(result: Result<Any?>?) {
+            (object : WriteCommandAction.Simple<Any>(getProject()) {
+                protected override fun run(result: Result<Any>) {
                     run()
                 }
                 protected override fun run() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
index 2c023c75be8..e049f49f460 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
@@ -186,7 +186,7 @@ public abstract class AbstractOverrideImplementTest extends LightCodeInsightFixt
     }
 
     private void generateImplementation(@NotNull final PsiMethod method) {
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        WriteCommandAction.runWriteCommandAction(getProject(), new Runnable() {
             @Override
             public void run() {
                 PsiClass aClass = ((PsiClassOwner) myFixture.getFile()).getClasses()[0];
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
index a8bf4d22bf5..7af1ab50a12 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
@@ -267,6 +267,14 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
 
     private void typeAndNextTab(String s) {
         type(s);
+        nextTab();
+    }
+
+    private void type(String s) {
+        myFixture.type(s);
+    }
+
+    private void nextTab() {
         UIUtil.invokeAndWaitIfNeeded(new Runnable() {
             @Override
             public void run() {
@@ -276,7 +284,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
                         ApplicationManager.getApplication().runWriteAction(new Runnable() {
                             @Override
                             public void run() {
-                                nextTab();
+                                getTemplateState().nextTab();
                             }
                         });
                     }
@@ -285,14 +293,6 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         });
     }
 
-    private void type(String s) {
-        myFixture.type(s);
-    }
-
-    private void nextTab() {
-        getTemplateState().nextTab();
-    }
-
     private void nextTab(int times) {
         for (int i = 0; i < times; i++) {
             nextTab();
diff --git a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
index ec98fae180e..fdee11b66df 100644
--- a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
+++ b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public class JUnitMembersSearcherTest extends AbstractSearcherTest {
     private static final LightProjectDescriptor junitProjectDescriptor =
-            new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.10.jar"));
+            new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));
 
     public void testJunit3() throws IOException {
         doJUnit3test();
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
index 46f3c02c13b..b4c7b230361 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
@@ -34,6 +34,8 @@ import com.intellij.psi.codeStyle.CodeStyleManager
 import org.jetbrains.jet.JetTestUtils
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.application.Result
 
 public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
 public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
@@ -72,7 +74,7 @@ abstract class AbstractJavaToKotlinConverterTest(
 
     private fun reformat(text: String, project: Project): String {
         val convertedFile = JetTestUtils.createFile("converted", text, project)
-        ApplicationManager.getApplication()!!.runWriteAction {
+        WriteCommandAction.runWriteCommandAction(project) {
             CodeStyleManager.getInstance(project)!!.reformat(convertedFile)
         }
         return convertedFile.getText()!!
diff --git a/jdk-annotations/java/io/annotations.xml b/jdk-annotations/java/io/annotations.xml
index 129f066a3c7..749ddfa640b 100644
--- a/jdk-annotations/java/io/annotations.xml
+++ b/jdk-annotations/java/io/annotations.xml
@@ -603,6 +603,12 @@
     <item name="java.io.PipedWriter void write(char[], int, int) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.io.PrintStream void print(char[]) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.io.PrintStream void println(char[]) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.io.PrintStream PrintStream(java.io.File, java.lang.String) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -642,6 +648,18 @@
     <item name="java.io.PrintStream java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.io.PrintStream java.io.PrintStream printf(java.lang.String, java.lang.Object...) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.io.PrintStream java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...) 1">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.io.PrintStream java.io.PrintStream format(java.lang.String, java.lang.Object...) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.io.PrintStream java.io.PrintStream format(java.util.Locale, java.lang.String, java.lang.Object...) 1">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.io.PrintStream java.lang.Appendable append(char)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
diff --git a/jdk-annotations/java/nio/annotations.xml b/jdk-annotations/java/nio/annotations.xml
index a299a37bb9f..8d4fbe968af 100644
--- a/jdk-annotations/java/nio/annotations.xml
+++ b/jdk-annotations/java/nio/annotations.xml
@@ -24,6 +24,12 @@
     <item name="java.nio.ByteBuffer byte[] array()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.nio.Buffer java.lang.Object array()">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.nio.CharBuffer char[] array()">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.nio.ByteBuffer int compareTo(java.lang.Object) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -264,6 +270,9 @@
     <item name="java.nio.CharBuffer java.nio.CharBuffer wrap(char[], int, int)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.nio.CharBuffer java.nio.CharBuffer wrap(char[], int, int) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -273,6 +282,9 @@
     <item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence, int, int)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence, int, int) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.nio.DoubleBuffer int compareTo(java.lang.Object) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -624,5 +636,8 @@
     <item name="java.nio.ShortBuffer java.nio.ShortBuffer wrap(short[], int, int)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.nio.charset.Charset java.util.SortedMap&lt;java.lang.String,java.nio.charset.Charset&gt; availableCharsets()">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
 </root>
 
diff --git a/jdk-annotations/java/nio/charset/annotations.xml b/jdk-annotations/java/nio/charset/annotations.xml
index 68c1fdca219..aa66635a5d4 100644
--- a/jdk-annotations/java/nio/charset/annotations.xml
+++ b/jdk-annotations/java/nio/charset/annotations.xml
@@ -141,5 +141,8 @@
     <item name="java.nio.charset.Charset java.nio.charset.Charset defaultCharset()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name='java.nio.charset.Charset java.util.SortedMap&lt;java.lang.String,java.nio.charset.Charset&gt; availableCharsets()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
 
diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml
index 8843aa74602..bafb08b405f 100644
--- a/jdk-annotations/java/util/annotations.xml
+++ b/jdk-annotations/java/util/annotations.xml
@@ -2110,6 +2110,9 @@
     <item name="java.util.Formatter java.util.Formatter format(java.util.Locale, java.lang.String, java.lang.Object...)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.Formatter java.util.Formatter format(java.util.Locale, java.lang.String, java.lang.Object...) 1">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.Formatter.BigDecimalLayoutForm java.util.Formatter.BigDecimalLayoutForm valueOf(java.lang.String)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -2983,12 +2986,21 @@
     <item name="java.util.Random void nextBytes(byte[]) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.util.Set&lt;java.lang.String&gt; handleKeySet()">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.util.ResourceBundle java.util.Enumeration&lt;java.lang.String&gt; getKeys()">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle boolean containsKey(java.lang.String) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
     <item name="java.util.ResourceBundle java.lang.Object getObject(java.lang.String)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.lang.Object getObject(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.lang.Object handleGetObject(java.lang.String) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -2998,15 +3010,33 @@
     <item name="java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.lang.String getString(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 2">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 0">
+       <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
@@ -3016,12 +3046,18 @@
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 3">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 2">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
+    <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control) 0">
+        <annotation name="org.jetbrains.annotations.NotNull"/>
+    </item>
     <item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
     </item>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index c668826f899..5dc33781e68 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="2328799"/>
-    <property name="public.buildserver.build.id" value="112061"/>
+    <property name="jb.buildserver.build.id" value="2358260"/>
+    <property name="public.buildserver.build.id" value="114358"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />
@@ -19,7 +19,7 @@
       </and>
     </condition>
 
-    <property name="idea.build.number" value="133.SNAPSHOT"/>
+    <property name="idea.build.number" value="134.SNAPSHOT"/>
 
     <property name="idea.archive.name" value="ideaIC-${idea.build.number}.${os.tag}"/>
 
@@ -144,6 +144,9 @@
         <!-- dx.jar -->
         <get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/>
 
+        <!-- hamcrest-core.jar -->
+        <get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" target.jar.name.base="hamcrest-core"/>
+
         <!-- jflex 1.4 -->
         <mkdir dir="dependencies/jflex"/>
         <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/jflex-1.4/lib/JFlex.jar"