diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 3626e8552d8..ce9c9cb42d4 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -4,7 +4,7 @@
     <root id="root">
       <element id="directory" name="Kotlin">
         <element id="directory" name="lib">
-          <element id="library" level="project" name="asm" />
+          <element id="library" level="project" name="asm-util" />
           <element id="archive" name="kotlin-plugin.jar">
             <element id="module-output" name="backend" />
             <element id="module-output" name="frontend" />
diff --git a/.idea/libraries/asm.xml b/.idea/libraries/asm.xml
deleted file mode 100644
index 3de86f5b6c3..00000000000
--- a/.idea/libraries/asm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="asm">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/asm-analysis-3.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/asm-tree-3.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/asm-util-3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/asm-3.3-src.zip!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/asm_util.xml b/.idea/libraries/asm_util.xml
new file mode 100644
index 00000000000..fd5b05e4446
--- /dev/null
+++ b/.idea/libraries/asm_util.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="asm-util">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-util-4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0-src.zip!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/idea_full.xml b/.idea/libraries/idea_full.xml
index 198f46a091f..58b04f543b5 100644
--- a/.idea/libraries/idea_full.xml
+++ b/.idea/libraries/idea_full.xml
@@ -140,7 +140,6 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/forms-compiler/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/impl/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/javac2/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/notNull/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/openapi/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/idea-ui/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/openapi/src" />
@@ -148,8 +147,6 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/antLayout/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/src" />
-      <root url="jar://$PROJECT_DIR$/lib/asm-3.3-src.zip!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
   </library>
diff --git a/.idea/libraries/intellij_core.xml b/.idea/libraries/intellij_core.xml
index b85a709473b..89612d71fb2 100644
--- a/.idea/libraries/intellij_core.xml
+++ b/.idea/libraries/intellij_core.xml
@@ -2,6 +2,7 @@
   <library name="intellij-core">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/ideaSDK/core" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
@@ -53,13 +54,10 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/forms-compiler/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/impl/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/javac2/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/notNull/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/compiler/openapi/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/idea-ui/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/java/openapi/src" />
-      <root url="jar://$USER_HOME$/Downloads/picocontainer-2.10-20100209.093751-5-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Downloads/picocontainer-1.3-20061227.142936-4-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/asm-3.3-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0-src.zip!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
   </library>
diff --git a/build.xml b/build.xml
index 5d9c510e997..23c6fb172ff 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,8 @@
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jline.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jansi.jar"/>
+        <fileset dir="${basedir}/dependencies" includes="jetbrains-asm-all-4.0.jar"/>
+        <fileset dir="${basedir}/dependencies" includes="jetbrains-asm-util-4.0.jar"/>
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </path>
 
@@ -208,9 +210,14 @@
 
             <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
             <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar"/>
+            <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="jna-utils.jar"/>
+            <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="oromatcher.jar"/>
             <zipgroupfileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jline.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jansi.jar"/>
+            <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-all-4.0.jar"/>
+            <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-util-4.0.jar"/>
+            <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-analysis-4.0.jar"/>
 
             <zap pattern="com.thoughtworks.xstream.converters.extended.ISO8601*"/>
             <zap pattern="com.thoughtworks.xstream.converters.reflection.CGLIBEnhancedConverter*"/>
@@ -293,6 +300,8 @@
                     -injars '${output}/kotlin-compiler-before-proguard.jar'
                     -outjars '${kotlin-home}/lib/kotlin-compiler.jar'
 
+                    -dontwarn org.jetbrains.jet.internal.com.intellij.util.**
+
                     -libraryjars '${rtjar}'
 
                     -target 1.6
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 3863a3c3630..ab7071d41c1 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="library" name="asm-util" level="project" />
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index c0cbe2baf01..bbdeb6ba1ea 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="library" name="asm-util" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
   </component>
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index c20ff6b17a1..04811778b97 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="library" name="asm-util" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
   </component>
 </module>
diff --git a/lib/asm-3.3-src.zip b/lib/asm-3.3-src.zip
deleted file mode 100644
index 68995ddf62e..00000000000
Binary files a/lib/asm-3.3-src.zip and /dev/null differ
diff --git a/lib/asm-analysis-3.3.jar b/lib/asm-analysis-3.3.jar
deleted file mode 100644
index 852d9815892..00000000000
Binary files a/lib/asm-analysis-3.3.jar and /dev/null differ
diff --git a/lib/asm-tree-3.3.jar b/lib/asm-tree-3.3.jar
deleted file mode 100644
index 4a5daa68a01..00000000000
Binary files a/lib/asm-tree-3.3.jar and /dev/null differ
diff --git a/lib/asm-util-3.3.jar b/lib/asm-util-3.3.jar
deleted file mode 100644
index 115bcc732a0..00000000000
Binary files a/lib/asm-util-3.3.jar and /dev/null differ
diff --git a/update_dependencies.xml b/update_dependencies.xml
index f0dcd86dde2..d78fd8c92db 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,12 +1,17 @@
 <project name="Update Dependencies" default="update">
-    <property name="build.zip" value="ideaIC-117.SNAPSHOT.win.zip"/>
 
     <target name="update" depends="fetch-third-party">
-        <execute_update/>
+        <execute_update
+            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/67291:id"
+            build.zip="ideaIC-120.SNAPSHOT.win.zip"
+        />
     </target>
 
     <target name="jb_update" depends="fetch-third-party">
-        <execute_update teamcity="http://buildserver.labs.intellij.net" teamcity.build="bt2560"/>
+        <execute_update
+            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt24/1481384:id"
+            build.zip="ideaIC-120.214.win.zip"
+        />
     </target>
 
     <target name="update-no-third-party">
@@ -92,17 +97,79 @@
         <get src="http://repository.jetbrains.com/remote-repos/org/fusesource/jansi/jansi/1.9/jansi-1.9-sources.jar"
              dest="dependencies/download/jansi-1.9-sources.jar" usetimestamp="true"/>
         <copy file="dependencies/download/jansi-1.9-sources.jar" tofile="dependencies/jansi-sources.jar" overwrite="true"/>
+
+
+        <!-- ASM 4 -->
+        <asm4/>
     </target>
 
-    <macrodef name="execute_update">
-        <attribute name="teamcity" default="http://teamcity.jetbrains.com"/>
+    <macrodef name="asm4">
+        <sequential>
+            <get src="http://download.forge.objectweb.org/asm/asm-4.0-bin.zip"
+                 dest="dependencies/download/asm-4.0-bin.zip" usetimestamp="true"/>
 
-        <!-- IDEA CE 11.1 branch 117 -->
-        <attribute name="teamcity.build" default="bt365"/>
+            <delete dir="dependencies/download/asm" failonerror="false"/>
+            <unzip src="dependencies/download/asm-4.0-bin.zip" dest="dependencies/download/asm">
+                <patternset>
+                    <include name="asm-4.0/lib/asm-util-4.0.jar"/>
+                    <include name="asm-4.0/lib/asm-tree-4.0.jar"/>
+                    <include name="asm-4.0/lib/asm-commons-4.0.jar"/>
+                    <include name="asm-4.0/lib/asm-analysis-4.0.jar"/>
+                    <include name="asm-4.0/lib/asm-4.0.jar"/>
+                    <include name="asm-4.0/src.zip"/>
+                </patternset>
+                <mapper type="flatten"/>
+            </unzip>
+            <unzip src="dependencies/download/asm/src.zip" dest="dependencies/download/asm/src">
+                <patternset>
+                    <include name="**/*"/>
+                </patternset>
+            </unzip>
+
+            <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
+
+            <jarjar jarfile="dependencies/jetbrains-asm-all-4.0.jar">
+                <zipfileset src="dependencies/download/asm/asm-tree-4.0.jar"/>
+                <zipfileset src="dependencies/download/asm/asm-commons-4.0.jar"/>
+                <zipfileset src="dependencies/download/asm/asm-4.0.jar"/>
+
+                <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
+            </jarjar>
+
+            <jarjar jarfile="dependencies/jetbrains-asm-util-4.0.jar">
+                <zipfileset src="dependencies/download/asm/asm-util-4.0.jar"/>
+
+                <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
+            </jarjar>
+
+            <jarjar jarfile="dependencies/jetbrains-asm-analysis-4.0.jar">
+                <zipfileset src="dependencies/download/asm/asm-analysis-4.0.jar"/>
+
+                <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
+            </jarjar>
+
+            <replaceregexp
+                match="org.objectweb.asm"
+                replace="org.jetbrains.asm4"
+              >
+                <fileset dir="dependencies/download/asm/src/">
+                    <include name="**/*.java"/>
+                </fileset>
+            </replaceregexp>
+
+            <move file="dependencies/download/asm/src/org/objectweb/asm"
+                    tofile="dependencies/download/asm/src/org/jetbrains/asm4"/>
+
+            <zip destfile="dependencies/jetbrains-asm-all-4.0-src.zip" basedir="dependencies/download/asm/src"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="execute_update">
+        <attribute name="base.url" default="http://teamcity.example.com"/>
+        <attribute name="build.zip" default="http://teamcity.example.com"/>
 
         <sequential>
             <property name="core" value="ideaSDK/core"/>
-            <property name="tc" value="@{teamcity}/guestAuth/repository/download/@{teamcity.build}/.lastSuccessful"/>
 
             <delete dir="ideaSDK" failonerror="false">
                 <exclude name="config/**"/>
@@ -110,18 +177,16 @@
             </delete>
 
             <mkdir dir="${core}"/>
-            <get src="${tc}/core/intellij-core.jar" dest="${core}/intellij-core.jar"/>
-            <get src="${tc}/core/annotations.jar" dest="${core}/annotations.jar"/>
-            <get src="${tc}/core/asm.jar" dest="${core}/asm.jar"/>
-            <get src="${tc}/core/asm-commons.jar" dest="${core}/asm-commons.jar"/>
-            <get src="${tc}/core/cli-10.jar" dest="${core}/cli-10.jar"/>
-            <get src="${tc}/core/guava-11.0.1.jar" dest="${core}/guava-11.0.1.jar"/>
-            <get src="${tc}/core/picocontainer.jar" dest="${core}/picocontainer.jar"/>
-            <get src="${tc}/core/trove4j.jar" dest="${core}/trove4j.jar"/>
+            <get src="@{base.url}/core/intellij-core.jar" dest="${core}/intellij-core.jar" usetimestamp="true"/>
+            <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
+            <get src="@{base.url}/core/cli-parser-1.1.jar" dest="${core}/cli-parser-1.1.jar" usetimestamp="true"/>
+            <get src="@{base.url}/core/guava-12.0.jar" dest="${core}/guava-12.0.jar" usetimestamp="true"/>
+            <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
+            <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>
 
-            <get src="${tc}/${build.zip}" dest="ideaSDK/${build.zip}"/>
-            <unzip src="ideaSDK/${build.zip}" dest="ideaSDK"/>
-            <delete file="ideaSDK/${build.zip}"/>
+            <get src="@{base.url}/@{build.zip}" dest="ideaSDK/@{build.zip}" usetimestamp="true"/>
+            <unzip src="ideaSDK/@{build.zip}" dest="ideaSDK"/>
+            <delete file="ideaSDK/@{build.zip}"/>
 
             <copy file="ideaSDK/lib/jdom.jar" todir="${core}"/>
             <copy file="ideaSDK/lib/jna.jar" todir="${core}"/>
@@ -140,7 +205,7 @@
             <delete file="ideaSDK/lib/junit.jar"/>
 
             <mkdir dir="ideaSDK/sources"/>
-            <get src="${tc}/sources.zip" dest="ideaSDK/sources/sources.zip"/>
+            <get src="@{base.url}/sources.zip" dest="ideaSDK/sources/sources.zip" usetimestamp="true"/>
         </sequential>
     </macrodef>
 </project>