From fe37e4a3dc0dd137b49aae42bcd9f3853dd263e3 Mon Sep 17 00:00:00 2001
From: Michael Vlassiev <michael.vlassiev@jetbrains.com>
Date: Fri, 3 Aug 2018 19:20:26 +0300
Subject: [PATCH] update MPS version to 2018.3

---
 .idea/runConfigurations/MPSDebug.xml             | 15 +++------------
 .../MPSDebug_with_profiling.xml                  | 16 +++++-----------
 .idea/runConfigurations/MPSLauncher.xml          | 12 ++----------
 .idea/runConfigurations/MPSLauncher2.xml         | 15 +++------------
 .idea/runConfigurations/MPS_Remote.xml           |  6 +++---
 IdeaPlugin/build.xml                             |  4 ++--
 IdeaPlugin/mps-core/META-INF/plugin.xml          |  4 ++--
 IdeaPlugin/mps-java/META-INF/plugin.xml          |  4 ++--
 IdeaPlugin/mps-migration/META-INF/plugin.xml     |  4 ++--
 IdeaPlugin/mps-vcs/META-INF/plugin.xml           |  4 ++--
 build.txt                                        |  2 +-
 build/mps.xml                                    |  6 +++---
 build/mpsBootstrapCore.xml                       |  2 +-
 build/run_build.sh                               |  2 +-
 .../jetbrains/mps/debugger/api/ui/actions.mps    |  4 ++--
 .../mps/debugger/api/ui/actions/generated        |  2 +-
 .../mps/debugger/api/ui/actions/plugin.xml       |  4 ++--
 .../java/customViewers/plugin/plugin.mps         |  4 ++--
 .../java/customViewers/plugin/plugin/generated   |  2 +-
 .../java/customViewers/plugin/plugin/plugin.xml  |  4 ++--
 .../mps/debugger/java/runtime/ui/actions.mps     |  2 +-
 .../debugger/java/runtime/ui/actions/generated   |  2 +-
 .../debugger/java/runtime/ui/actions/plugin.xml  |  2 +-
 .../demo/pluginSolution/models/plugin.mps        |  2 +-
 .../demo/pluginSolution/plugin/generated         |  2 +-
 .../demo/pluginSolution/plugin/plugin.xml        |  2 +-
 .../jetbrains/mps/execution/languages/plugin.mps |  4 ++--
 .../mps/execution/languages/plugin/generated     |  2 +-
 .../mps/execution/languages/plugin/plugin.xml    |  4 ++--
 .../solution/modelchecker/actions.mps            |  4 ++--
 .../mps/ide/modelchecker/actions/generated       |  2 +-
 .../mps/ide/modelchecker/actions/plugin.xml      |  4 ++--
 plugins/mps-build/META-INF/plugin.xml            |  4 ++--
 .../mps/build/mps/pluginSolution/plugin.mps      |  2 +-
 .../build/mps/pluginSolution/plugin/generated    |  2 +-
 .../solutions/mpsBuild/models/build.mps          | 16 +++++++++-------
 .../jetbrains/mps/ide/build/generated            |  2 +-
 .../jetbrains/mps/ide/build/Info.plist.xml       |  4 ++--
 .../source_gen/jetbrains/mps/ide/build/mps.bat   |  8 ++++----
 .../source_gen/jetbrains/mps/ide/build/mps.sh    | 12 ++++++------
 .../source_gen/jetbrains/mps/ide/build/mps.xml   |  6 +++---
 .../jetbrains/mps/ide/build/mpsBootstrapCore.xml |  2 +-
 plugins/mps-testing/META-INF/plugin.xml          |  4 ++--
 plugins/mpsdevkit/solution/devkit/actions.mps    |  4 ++--
 .../jetbrains/mps/ide/devkit/actions/generated   |  2 +-
 .../jetbrains/mps/ide/devkit/actions/plugin.xml  |  4 ++--
 plugins/mpsmake/make/actions.mps                 |  4 ++--
 .../jetbrains/mps/ide/make/actions/generated     |  2 +-
 .../jetbrains/mps/ide/make/actions/plugin.xml    |  4 ++--
 plugins/projectMigrations/META-INF/plugin.xml    |  6 +++---
 .../models/jetbrains/mps/vcs/plugin.mps          |  4 ++--
 .../jetbrains/mps/vcs/plugin/generated           |  2 +-
 .../jetbrains/mps/vcs/plugin/plugin.xml          |  4 ++--
 releaseNotes.txt                                 |  2 +-
 .../jetbrains.mps.ide/models/actions.mps         |  4 ++--
 .../jetbrains/mps/ide/actions/generated          |  2 +-
 .../jetbrains/mps/ide/actions/plugin.xml         |  4 ++--
 .../source/idea/IdeaApplicationInfo.xml          |  4 ++--
 58 files changed, 116 insertions(+), 146 deletions(-)

diff --git a/.idea/runConfigurations/MPSDebug.xml b/.idea/runConfigurations/MPSDebug.xml
index ad866c37a751..cc4065e0a387 100644
--- a/.idea/runConfigurations/MPSDebug.xml
+++ b/.idea/runConfigurations/MPSDebug.xml
@@ -1,17 +1,9 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MPSDebug" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="jetbrains.mps.Launcher" />
-    <option name="VM_PARAMETERS" value="-ea -Xmx4096m -XX:NewSize=384m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.1 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5070 -Didea.debug.mode=true -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
     <module name="startup" />
-    <envs />
+    <option name="VM_PARAMETERS" value="-ea -Xmx4096m -XX:NewSize=384m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.3 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5083 -Didea.debug.mode=true -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="1857" />
       <option name="TRANSPORT" value="0" />
@@ -22,8 +14,7 @@
     <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Profile " />
     <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="Make" enabled="false" />
+    <method v="2">
       <option name="MakeProject" enabled="true" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/MPSDebug_with_profiling.xml b/.idea/runConfigurations/MPSDebug_with_profiling.xml
index 3ce725c0404c..e31674c08a0e 100644
--- a/.idea/runConfigurations/MPSDebug_with_profiling.xml
+++ b/.idea/runConfigurations/MPSDebug_with_profiling.xml
@@ -1,18 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MPSDebug with profiling" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="jetbrains.mps.Launcher" />
-    <option name="VM_PARAMETERS" value="-ea -Xmx4096m -XX:NewSize=384m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.1 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5070 -javaagent:$PROJECT_DIR$/build/artifacts/editorInstrumentation/editorAgent.jar -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="MAIN_CLASS_NAME" value="jetbrains.mps.Launcher" />
     <module name="startup" />
-    <envs />
-    <method>
+    <option name="VM_PARAMETERS" value="-ea -Xmx4096m -XX:NewSize=384m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.3 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5083 -javaagent:$PROJECT_DIR$/build/artifacts/editorInstrumentation/editorAgent.jar -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
+    <method v="2">
+      <option name="Make" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/editor/instrumentation/build.xml" target="build" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/MPSLauncher.xml b/.idea/runConfigurations/MPSLauncher.xml
index eb4f626b15fe..2ea8c630cee9 100644
--- a/.idea/runConfigurations/MPSLauncher.xml
+++ b/.idea/runConfigurations/MPSLauncher.xml
@@ -1,17 +1,9 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MPSLauncher" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="jetbrains.mps.Launcher" />
-    <option name="VM_PARAMETERS" value="-client -ea -Xmx4096m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.1 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
     <module name="startup" />
-    <envs />
+    <option name="VM_PARAMETERS" value="-client -ea -Xmx4096m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.3 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="4454" />
       <option name="TRANSPORT" value="0" />
diff --git a/.idea/runConfigurations/MPSLauncher2.xml b/.idea/runConfigurations/MPSLauncher2.xml
index 08591a8884e7..60cb872d3312 100644
--- a/.idea/runConfigurations/MPSLauncher2.xml
+++ b/.idea/runConfigurations/MPSLauncher2.xml
@@ -1,19 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MPSLauncher2" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="jetbrains.mps.Launcher" />
-    <option name="VM_PARAMETERS" value="-client -ea -Xmx4096m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.1_0 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
     <module name="startup" />
-    <envs />
-    <method>
-      <option name="Make" enabled="false" />
+    <option name="VM_PARAMETERS" value="-client -ea -Xmx4096m -Dmps.internal=true -XX:+HeapDumpOnOutOfMemoryError -Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=&quot;JetBrains MPS&quot; -Dapple.awt.graphics.UseQuartz=true -Dide.mac.message.dialogs.as.sheets=false -Didea.paths.selector=MPSSRC2018.3_0 -Dintellij.config.imported.in.current.session=true -Dawt.useSystemAAFontSettings=lcd -XX:MaxJavaStackTraceDepth=10000 -XX:-OmitStackTraceInFastThrow -Djava.net.preferIPv4Stack=true -Dsun.io.useCanonCaches=false -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+UseConcMarkSweepGC" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
+    <method v="2">
       <option name="MakeProject" enabled="true" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/MPS_Remote.xml b/.idea/runConfigurations/MPS_Remote.xml
index d62ba925f939..1ef4e3df6dcb 100644
--- a/.idea/runConfigurations/MPS_Remote.xml
+++ b/.idea/runConfigurations/MPS_Remote.xml
@@ -2,9 +2,9 @@
   <configuration default="false" name="MPS Remote" type="Remote" factoryName="Remote">
     <option name="USE_SOCKET_TRANSPORT" value="true" />
     <option name="SERVER_MODE" value="false" />
-    <option name="SHMEM_ADDRESS" value="javadebug" />
+    <option name="SHMEM_ADDRESS" />
     <option name="HOST" value="localhost" />
-    <option name="PORT" value="5070" />
-    <method />
+    <option name="PORT" value="5083" />
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/IdeaPlugin/build.xml b/IdeaPlugin/build.xml
index 06eb0e377cbf..c4c9fdd2db65 100644
--- a/IdeaPlugin/build.xml
+++ b/IdeaPlugin/build.xml
@@ -20,10 +20,10 @@
         ant -Dhome.idea_ce={IDEA_HOME_DIR} -Dhome.idea_ce.plugins={IDEA_PLUGINS_FOLDER} <task>
 
         e.g. for MacOs it will be:
-        ant -Dhome.idea_ce=/Applications/IntelliJ\ IDEA\ CE\ 2018.2.app/Contents/ -Dhome.idea_ce.plugins=~/Library/Application Support/IdeaIC2018.2 <task>
+        ant -Dhome.idea_ce=/Applications/IntelliJ\ IDEA\ CE\ 2018.3.app/Contents/ -Dhome.idea_ce.plugins=~/Library/Application Support/IdeaIC2018.3 <task>
 
      2. To run tests locally, it's sufficient to set home.idea_ce and home.jdk:
-        ant -Dhome.idea_ce=/IDEA13/ -Dhome.jdk=/Library/Java/Home/ -f IdeaPlugin/build.xml clean zip runTests
+        ant -Dhome.idea_ce=/IDEAXX/ -Dhome.jdk=/Library/Java/Home/ -f IdeaPlugin/build.xml clean zip runTests
 
      To connect to running tests and debug with Idea, uncomment/modify 'junit.debug.arg' property below
   -->
diff --git a/IdeaPlugin/mps-core/META-INF/plugin.xml b/IdeaPlugin/mps-core/META-INF/plugin.xml
index ffa3253f1acb..940c95ead21a 100644
--- a/IdeaPlugin/mps-core/META-INF/plugin.xml
+++ b/IdeaPlugin/mps-core/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Core</name>
   <category>Custom Languages</category>
   <description>MPS Core</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <depends optional="true" config-file="idea-support.xml">com.intellij.modules.java</depends>
   <depends optional="true" config-file="intellij-ides-support.xml">com.intellij.modules.ultimate</depends>
diff --git a/IdeaPlugin/mps-java/META-INF/plugin.xml b/IdeaPlugin/mps-java/META-INF/plugin.xml
index 84dc71236bfe..d333dfce0946 100644
--- a/IdeaPlugin/mps-java/META-INF/plugin.xml
+++ b/IdeaPlugin/mps-java/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS BaseLanguage Support</name>
   <description>Support of the MPS BaseLanguage (JAVA)</description>
   <category>Custom Languages</category>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
   <depends>jetbrains.mps.core</depends>
   <depends>jetbrains.mps.ide.migration.idea</depends>
 
diff --git a/IdeaPlugin/mps-migration/META-INF/plugin.xml b/IdeaPlugin/mps-migration/META-INF/plugin.xml
index 629a4a5491fa..13b8bfe92d25 100644
--- a/IdeaPlugin/mps-migration/META-INF/plugin.xml
+++ b/IdeaPlugin/mps-migration/META-INF/plugin.xml
@@ -2,9 +2,9 @@
   <id>jetbrains.mps.ide.migration.idea</id>
   <name>MPS Migration Support for Idea</name>
   <description>MPS Migration Support for Idea Plugin</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <xi:include href="pluginBase.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
diff --git a/IdeaPlugin/mps-vcs/META-INF/plugin.xml b/IdeaPlugin/mps-vcs/META-INF/plugin.xml
index 1b3234b85be9..eb47b67e3317 100644
--- a/IdeaPlugin/mps-vcs/META-INF/plugin.xml
+++ b/IdeaPlugin/mps-vcs/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Version Control Support</name>
   <category>Custom Languages</category>
   <description>MPS Version Control support</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
   <depends>jetbrains.mps.core</depends>
 
   <depends optional="true">Subversion</depends>
diff --git a/build.txt b/build.txt
index 604c9ed99306..01ba50b90813 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-182.SNAPSHOT
\ No newline at end of file
+183.SNAPSHOT
\ No newline at end of file
diff --git a/build/mps.xml b/build/mps.xml
index eeabd84d20a2..875630b9ef53 100644
--- a/build/mps.xml
+++ b/build/mps.xml
@@ -59,7 +59,7 @@
     <mkdir dir="${build.tmp}/default/branding.jar/idea" />
     <echoxml file="${build.tmp}/default/branding.jar/idea/IdeaApplicationInfo.xml">
       <component>
-        <version codename="MPS" major="2018" minor="2" eap="false" update-channel="MPS182" />
+        <version codename="MPS" major="2018" minor="3" eap="true" update-channel="MPS183EAP" />
         <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE" copyrightStart="2009" />
         <build number="${build.number}" date="${date}" />
         <logo url="/splash.png" textcolor="FFFFFF" progressColor="FFFFFF" progressX="117" progressY="280" progressHeight="3" />
@@ -77,9 +77,9 @@
         <help root="mps" webhelp-url="http://www.jetbrains.com/mps/webhelp/" />
         <documentation url="https://www.jetbrains.com/mps/documentation" />
         <support url="https://www.jetbrains.com/support/mps/index.html" />
-        <feedback release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
+        <feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
         <whatsnew url="https://www.jetbrains.com/mps/whatsnew/index.html" />
-        <keymap win="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" />
+        <keymap win="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" />
         <third-party url="http://www.jetbrains.org/" />
         <jetbrains-tv url="http://www.youtube.com/user/JetBrainsTV/search?query=MPS" />
         
diff --git a/build/mpsBootstrapCore.xml b/build/mpsBootstrapCore.xml
index f8d9cdecd404..dd6dc1cd12fe 100644
--- a/build/mpsBootstrapCore.xml
+++ b/build/mpsBootstrapCore.xml
@@ -3,7 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
-  <property name="version" value="2018.2" />
+  <property name="version" value="2018.3 EAP" />
   <property name="idea_home" location="" />
   <property name="mps_home" location="${basedir}" />
   <property name="platform_lib" location="${basedir}/lib" />
diff --git a/build/run_build.sh b/build/run_build.sh
index c9479650ac7e..19c9138ce256 100755
--- a/build/run_build.sh
+++ b/build/run_build.sh
@@ -21,4 +21,4 @@ if [ $# -eq 0 ]; then
 else
   targets="$@"
 fi
-ant -f $mps_home/build/build.xml $targets -Dmps_home=$mps_home -Dbuild.number=182.1 -Dversion=2018.2 -Dbuild.vcs.number=HEAD -Dteamcity.buildConfName=local
+ant -f $mps_home/build/build.xml $targets -Dmps_home=$mps_home -Dbuild.number=183.1 -Dversion=2018.3 -Dbuild.vcs.number=HEAD -Dteamcity.buildConfName=local
diff --git a/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps b/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
index 2105efad6c3f..761706a3174a 100644
--- a/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
+++ b/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
@@ -2015,8 +2015,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="Debugger API for MPS" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="312cEu" id="24OxoGwTqg6">
     <property role="TrG5h" value="MuteBreakpoints" />
diff --git a/plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated b/plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
index 71c9c817487a..f63e4c4f334a 100644
--- a/plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
+++ b/plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="5uhnoj44982lc09x68lzrm20bb2x5v0" />
+<dependencies version="2" modelHash="3st6nceckj1mb3m8dp3m3deorh1hnlx" />
 
diff --git a/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml b/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
index a2e0bf5e8f68..9e57e52ab735 100644
--- a/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
+++ b/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.debugger.api</id>
   <name>Debugger API for MPS</name>
   <description>Base debugging support for MPS</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps b/plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
index edc6819e3fdf..ddcacf6b6bef 100644
--- a/plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
+++ b/plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
@@ -240,8 +240,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="BaseLanguage Debugger Support" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
     <node concept="2Tc6Op" id="5ODR6dNebC9" role="2Tc6Ou">
       <property role="2Tc6Oq" value="jetbrains.mps.debugger.java" />
     </node>
diff --git a/plugins/debugger-java/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated b/plugins/debugger-java/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated
index 8a78920ddfb3..42b28e41f27c 100644
--- a/plugins/debugger-java/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated
+++ b/plugins/debugger-java/customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9mbs3wjqwyx933lye76se1d5dfehbil" />
+<dependencies version="2" modelHash="-exkmknfrfx78wuyfyod9scdw34um6y7" />
 
diff --git a/plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml b/plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
index 2660e67c687f..b54f57c13c2f 100644
--- a/plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
+++ b/plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.debugger.java.customViewers</id>
   <name>BaseLanguage Debugger Support</name>
   <description>Debugger support for baseLanguage extensions</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   <depends>jetbrains.mps.debugger.java</depends>
   
diff --git a/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps b/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps
index 2424d65d5e73..bbcf63042180 100644
--- a/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps
+++ b/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps
@@ -630,7 +630,7 @@
     <property role="9BnSM" value="vendor" />
     <property role="1qHB85" value="mock" />
     <property role="TrG5h" value="name" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="9BnSK" value="version" />
   </node>
   <node concept="tC5Ba" id="7V1YZ6sOyPD">
diff --git a/plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated b/plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated
index 19bbc117a55b..67348bb1e6b9 100644
--- a/plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated
+++ b/plugins/debugger-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cpua3u2pmf0ub5464dnt6rg23fxuo8l" />
+<dependencies version="2" modelHash="-7j5gmjpz8dz4ruri7chvl4oawm20ugq" />
 
diff --git a/plugins/debugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml b/plugins/debugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml
index 20255f05810f..3ea4c48b44a2 100644
--- a/plugins/debugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml
+++ b/plugins/debugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml
@@ -6,7 +6,7 @@
   <description>description</description>
   <version>version</version>
   <vendor url="url">vendor</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps b/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps
index d6d67e0e5c99..5b9d36ad17ce 100644
--- a/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps
+++ b/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps
@@ -658,7 +658,7 @@
     <property role="9BnSM" value="a" />
     <property role="1qHB85" value="a" />
     <property role="TrG5h" value="a" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="9BnSK" value="a" />
   </node>
   <node concept="2DaZZR" id="6dAEaqvbGv_" />
diff --git a/plugins/execution-languages/languages/demo/pluginSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated b/plugins/execution-languages/languages/demo/pluginSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated
index dfd9180b7d5e..e4231c877340 100644
--- a/plugins/execution-languages/languages/demo/pluginSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated
+++ b/plugins/execution-languages/languages/demo/pluginSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-7p0pojx8bh3v7whdd0dyk12ylrvdjnb" />
+<dependencies version="2" modelHash="ct2lfu7apnxg29ftx71uwct7ohskj4x" />
 
diff --git a/plugins/execution-languages/languages/demo/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml b/plugins/execution-languages/languages/demo/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml
index a9dfa3a28fd0..c67fa4fd94f8 100644
--- a/plugins/execution-languages/languages/demo/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml
+++ b/plugins/execution-languages/languages/demo/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml
@@ -6,7 +6,7 @@
   <description>a</description>
   <version>a</version>
   <vendor url="a">a</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps b/plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
index 93776ea497e7..633a92f40bfe 100644
--- a/plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
+++ b/plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
@@ -37,10 +37,10 @@
     <property role="9BnSZ" value="jetbrains.mps.execution.languages" />
     <property role="TrG5h" value="Execution Languages" />
     <property role="9BnSL" value="Languages and libraries for implementing execution configurations for MPS" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSK" value="2018.3" />
     <property role="9BnSM" value="JetBrains" />
     <property role="9BnSP" value="http://www.jetbrains.com/mps/" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="2PJ1tZ" value="true" />
     <property role="3FCvg6" value="true" />
     <property role="1qHB85" value="/MPS_16.png" />
diff --git a/plugins/execution-languages/languages/plugin/source_gen.caches/jetbrains/mps/execution/languages/plugin/generated b/plugins/execution-languages/languages/plugin/source_gen.caches/jetbrains/mps/execution/languages/plugin/generated
index 4c02d368da2f..66cd15f71f21 100644
--- a/plugins/execution-languages/languages/plugin/source_gen.caches/jetbrains/mps/execution/languages/plugin/generated
+++ b/plugins/execution-languages/languages/plugin/source_gen.caches/jetbrains/mps/execution/languages/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="787q8j5n8cg3xrcf4fsf2h3dhext3x9" />
+<dependencies version="2" modelHash="-e5dw531sp63fkr04q1l8ewgkuaxs59z" />
 
diff --git a/plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml b/plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
index 1008cf25a96f..e0ca509c61c9 100644
--- a/plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
+++ b/plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.execution.languages</id>
   <name>Execution Languages</name>
   <description>Languages and libraries for implementing execution configurations for MPS</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   <depends>jetbrains.mps.debugger.java</depends>
   <depends>jetbrains.mps.debugger.api</depends>
diff --git a/plugins/modelchecker/solution/modelchecker/actions.mps b/plugins/modelchecker/solution/modelchecker/actions.mps
index 348a22de607a..84f0522e6cd4 100644
--- a/plugins/modelchecker/solution/modelchecker/actions.mps
+++ b/plugins/modelchecker/solution/modelchecker/actions.mps
@@ -534,8 +534,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="Model Checker" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="Zd50a" id="1gEYwydCqV1">
     <property role="TrG5h" value="Default" />
diff --git a/plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated b/plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated
index 66f632d1c5e2..5f2aceb6b435 100644
--- a/plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated
+++ b/plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="2xggwdy0it3jqwqd829kc4xvupux4j2" />
+<dependencies version="2" modelHash="7my44aeprn71124b25b50lgswknh3zo" />
 
diff --git a/plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml b/plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
index 0bb8b374a237..10e9efec3f7f 100644
--- a/plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
+++ b/plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.ide.modelchecker</id>
   <name>Model Checker</name>
   <description>Audit tool for MPS models</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/mps-build/META-INF/plugin.xml b/plugins/mps-build/META-INF/plugin.xml
index c70b000be1f8..89fcfcf24438 100644
--- a/plugins/mps-build/META-INF/plugin.xml
+++ b/plugins/mps-build/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Build languages</name>
   <description>Declarative build languages</description>
   <category>Custom Languages</category>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com" email="support@jetbrains.com">JetBrains s.r.o.</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
   <depends>jetbrains.mps.core</depends>
   <depends optional="true" config-file="pluginSolutions.xml">jetbrains.mps.execution.configurations</depends>
 
diff --git a/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/models/jetbrains/mps/build/mps/pluginSolution/plugin.mps b/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/models/jetbrains/mps/build/mps/pluginSolution/plugin.mps
index 8358c987e72e..c5ef7ae84b50 100644
--- a/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/models/jetbrains/mps/build/mps/pluginSolution/plugin.mps
+++ b/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/models/jetbrains/mps/build/mps/pluginSolution/plugin.mps
@@ -12546,7 +12546,7 @@
                               </node>
                             </node>
                             <node concept="1zDrgl" id="2OJWaFGOVpJ" role="39821P">
-                              <ref role="1zDrgn" to="ffeo:6Iq8148fw_a" resolve="JetBrains MPS 2018.2" />
+                              <ref role="1zDrgn" to="ffeo:6Iq8148fw_a" resolve="JetBrains MPS 2018.3" />
                               <node concept="2c44tb" id="2OJWaFGOXry" role="lGtFl">
                                 <property role="2qtEX8" value="element" />
                                 <property role="P3scX" value="798100da-4f0a-421a-b991-71f8c50ce5d2/7753544965996647428/7753544965996647430" />
diff --git a/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen.caches/jetbrains/mps/build/mps/pluginSolution/plugin/generated b/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen.caches/jetbrains/mps/build/mps/pluginSolution/plugin/generated
index e95990b80786..51e95eb0390e 100644
--- a/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen.caches/jetbrains/mps/build/mps/pluginSolution/plugin/generated
+++ b/plugins/mps-build/pluginSolutions/jetbrains.mps.build.mps.pluginSolution/source_gen.caches/jetbrains/mps/build/mps/pluginSolution/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-cd6cu5ayxk3bfvmu4vsh189lfsfwq3p" />
+<dependencies version="2" modelHash="-a6w5t1mh7scdo3u42tb2yvjnez27pr0" />
 
diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps
index adf7caf65104..eb91a0cc8b58 100644
--- a/plugins/mps-build/solutions/mpsBuild/models/build.mps
+++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps
@@ -361,6 +361,7 @@
       <concept id="7753544965996377997" name="jetbrains.mps.build.mps.structure.BuildMps_Branding" flags="ng" index="1zClus">
         <property id="3497141547781541445" name="minor" index="2OjLBK" />
         <property id="3497141547781541444" name="major" index="2OjLBL" />
+        <property id="3497141547781541446" name="eap" index="2OjLBN" />
         <child id="6845119683729424406" name="customXmlElement" index="27hc03" />
         <child id="6845119683729337285" name="progressY" index="27hAJg" />
         <child id="6845119683729294884" name="progressColor" index="27hGoL" />
@@ -2288,7 +2289,7 @@
       <node concept="aVJcg" id="5HVSRHdVf2e" role="aVJcv">
         <node concept="NbPM2" id="5HVSRHdVf2f" role="aVJcq">
           <node concept="3Mxwew" id="5HVSRHdVf2g" role="3MwsjC">
-            <property role="3MwjfP" value="2018.2" />
+            <property role="3MwjfP" value="2018.3 EAP" />
           </node>
         </node>
       </node>
@@ -19645,9 +19646,10 @@
       <ref role="1l3spb" node="3E9C6pCXzPk" resolve="mpsConsolePlugin" />
     </node>
     <node concept="1zClus" id="6Iq8148fw_a" role="3989C9">
-      <property role="2OjLBK" value="2" />
+      <property role="2OjLBK" value="3" />
       <property role="TrG5h" value="MPS" />
       <property role="2OjLBL" value="2018" />
+      <property role="2OjLBN" value="true" />
       <node concept="NbPM2" id="2FTyjkjSqva" role="2gocG4">
         <node concept="3Mxwew" id="2FTyjkjSqv9" role="3MwsjC">
           <property role="3MwjfP" value="117" />
@@ -19698,12 +19700,12 @@
       <node concept="3$GE4K" id="57dcfYPx6EW" role="3$GE96">
         <node concept="3_J27D" id="57dcfYPx6EX" role="3$GE4B">
           <node concept="3Mxwew" id="57dcfYPx6F4" role="3MwsjC">
-            <property role="3MwjfP" value="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" />
+            <property role="3MwjfP" value="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" />
           </node>
         </node>
         <node concept="3_J27D" id="57dcfYPx6EY" role="3$GE4G">
           <node concept="3Mxwew" id="57dcfYPx6F2" role="3MwsjC">
-            <property role="3MwjfP" value="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" />
+            <property role="3MwjfP" value="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" />
           </node>
         </node>
       </node>
@@ -19816,7 +19818,7 @@
         </node>
         <node concept="NbPM2" id="6Iq8148f_YW" role="HFWMp">
           <node concept="3Mxwew" id="6Iq8148f_YX" role="3MwsjC">
-            <property role="3MwjfP" value="MPS182" />
+            <property role="3MwjfP" value="MPS183EAP" />
           </node>
         </node>
       </node>
@@ -20024,7 +20026,7 @@
             </node>
           </node>
           <node concept="1zDrgl" id="6Iq8148gFCu" role="39821P">
-            <ref role="1zDrgn" node="6Iq8148fw_a" resolve="JetBrains MPS 2018.2" />
+            <ref role="1zDrgn" node="6Iq8148fw_a" resolve="JetBrains MPS 2018.3" />
           </node>
           <node concept="28jJK3" id="5gyid2dEaaf" role="39821P">
             <node concept="55IIr" id="5gyid2dEaag" role="28jJRO">
@@ -27482,7 +27484,7 @@
     <property role="TrG5h" value="mps" />
     <property role="3GE5qa" value="ide.data" />
     <property role="26EafI" value="bin" />
-    <ref role="1_kbm$" node="6Iq8148fw_a" resolve="JetBrains MPS 2018.2" />
+    <ref role="1_kbm$" node="6Iq8148fw_a" resolve="JetBrains MPS 2018.3" />
     <node concept="26Ea6D" id="2lwFGYOW7EY" role="2hID6k">
       <property role="26Ea6C" value="-client -Xss1024k -ea -Xmx2048m -XX:MaxPermSize=350m -XX:NewSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xverify:none" />
     </node>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
index 9a438ee014b9..f0925d9d49e8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-2o26oitt92eum8nio7sjninl22pzvb1" />
+<dependencies version="2" modelHash="-edwgl40xyty5q7amcpahsk1kgmllz38" />
 
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/Info.plist.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/Info.plist.xml
index 02d37c592775..080f6669a498 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/Info.plist.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/Info.plist.xml
@@ -101,7 +101,7 @@
         <string>false</string>
         
         <key>idea.paths.selector</key>
-        <string>MPS2018.2</string>
+        <string>MPS2018.3</string>
         
         <key>idea.executable</key>
         <string>mps</string>
@@ -111,7 +111,7 @@
         <key>idea.home.path</key>
         <string>$APP_PACKAGE/Contents</string>
       </dict>
-      <!--Use Contents/bin/mps.vmoptions or ~/Library/Preferences/MPS2018.2/mps.vmoptions file to modify VMOptions-->
+      <!--Use Contents/bin/mps.vmoptions or ~/Library/Preferences/MPS2018.3/mps.vmoptions file to modify VMOptions-->
       <key>VMOptions</key>
       <string>-XX:+UseCompressedOops</string>
       <key>WorkingDirectory</key>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.bat b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.bat
index ea78e14aac71..373486952fec 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.bat
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.bat
@@ -32,9 +32,9 @@ IF EXIST "%MPS_JDK%" SET JDK=%MPS_JDK%
 IF NOT "%JDK%" == "" GOTO check
 
 SET BITS=64
-SET USER_JDK64_FILE=%USERPROFILE%\.MPS2018.2\config\mps%BITS%.exe.jdk
+SET USER_JDK64_FILE=%USERPROFILE%\.MPS2018.3\config\mps%BITS%.exe.jdk
 SET BITS=
-SET USER_JDK_FILE=%USERPROFILE%\.MPS2018.2\config\mps%BITS%.exe.jdk
+SET USER_JDK_FILE=%USERPROFILE%\.MPS2018.3\config\mps%BITS%.exe.jdk
 IF EXIST "%USER_JDK64_FILE%" (
   SET /P JDK=<%USER_JDK64_FILE%
 ) ELSE (
@@ -79,7 +79,7 @@ IF EXIST "%JRE%\lib\amd64" SET BITS=64
 :: ---------------------------------------------------------------------
 IF NOT "%IDEA_PROPERTIES%" == "" SET IDE_PROPERTIES_PROPERTY="-Didea.properties.file=%IDEA_PROPERTIES%"
 
-SET USER_VM_OPTIONS_FILE=%USERPROFILE%\.MPS2018.2\mps%BITS%.exe.vmoptions
+SET USER_VM_OPTIONS_FILE=%USERPROFILE%\.MPS2018.3\mps%BITS%.exe.vmoptions
 SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\mps%BITS%.exe.vmoptions
 IF EXIST "%IDE_BIN_DIR%\win\mps%BITS%.exe.vmoptions" SET VM_OPTIONS_FILE=%IDE_BIN_DIR%\win\mps%BITS%.exe.vmoptions
 IF EXIST %USER_VM_OPTIONS_FILE% SET VM_OPTIONS_FILE=%USER_VM_OPTIONS_FILE%
@@ -97,7 +97,7 @@ IF EXIST "%VM_OPTIONS_FILE%" SET ACC=%ACC% -Djb.vmOptionsFile="%VM_OPTIONS_FILE%
 ::set ADDITIONAL_JVM_ARGS=-XX:ReservedCodeCacheSize=240m
 ::set ADDITIONAL_JVM_ARGS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5071
 
-set IDEA_PATHS_SELECTOR=MPS2018.2
+set IDEA_PATHS_SELECTOR=MPS2018.3
 SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_IDEA_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_IDEA.hprof" -Didea.paths.selector=%IDEA_PATHS_SELECTOR% %IDE_PROPERTIES_PROPERTY%
 SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true
 SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS% %ADDITIONAL_JVM_ARGS%
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.sh b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.sh
index ad3cbc2c263b..9441b7a2fffb 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.sh
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.sh
@@ -61,8 +61,8 @@ cd "$OLDPWD"
 # ---------------------------------------------------------------------
 if [ -n "$MPS_JDK" -a -x "$MPS_JDK/bin/java" ]; then
   JDK="$MPS_JDK"
-elif [ -s "$HOME/.MPS2018.2/config/mps.jdk" ]; then
-  JDK=`"$CAT" $HOME/.MPS2018.2/config/mps.jdk`
+elif [ -s "$HOME/.MPS2018.3/config/mps.jdk" ]; then
+  JDK=`"$CAT" $HOME/.MPS2018.3/config/mps.jdk`
   if [ ! -d "$JDK" ]; then
     JDK="$IDE_HOME/$JDK"
   fi
@@ -140,9 +140,9 @@ VM_OPTIONS_FILE=""
 if [ -n "$IDEA_VM_OPTIONS" -a -r "$IDEA_VM_OPTIONS" ]; then
   # explicit
   VM_OPTIONS_FILE="$IDEA_VM_OPTIONS"
-elif [ -r "$HOME/.MPS2018.2/mps$BITS.vmoptions" ]; then
+elif [ -r "$HOME/.MPS2018.3/mps$BITS.vmoptions" ]; then
   # user-overridden
-  VM_OPTIONS_FILE="$HOME/.MPS2018.2/mps$BITS.vmoptions"
+  VM_OPTIONS_FILE="$HOME/.MPS2018.3/mps$BITS.vmoptions"
 elif [ -r "$IDE_BIN_HOME/mps$BITS.vmoptions" ]; then
   # default, standard installation
   VM_OPTIONS_FILE="$IDE_BIN_HOME/mps$BITS.vmoptions"
@@ -164,7 +164,7 @@ if [ "$IS_EAP" = "true" ]; then
   OS_NAME=`echo "$OS_TYPE" | "$TR" '[:upper:]' '[:lower:]'`
   AGENT_LIB="yjpagent-$OS_NAME$BITS"
   if [ -r "$IDE_BIN_HOME/lib$AGENT_LIB.so" ]; then
-    AGENT="-agentlib:$AGENT_LIB=disablealloc,delay=10000,sessionname=MPS2018.2"
+    AGENT="-agentlib:$AGENT_LIB=disablealloc,delay=10000,sessionname=MPS2018.3"
   fi
 fi
 
@@ -196,7 +196,7 @@ fi
 # ---------------------------------------------------------------------
 IFS="$(printf '\n\t')"
 MAIN_CLASS=jetbrains.mps.Launcher
-IDEA_PATHS_SELECTOR=MPS2018.2
+IDEA_PATHS_SELECTOR=MPS2018.3
 LD_LIBRARY_PATH="$IDE_BIN_HOME:$LD_LIBRARY_PATH" "$JAVA_BIN" \
   ${AGENT} \
   -classpath "$CLASSPATH" \
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
index eeabd84d20a2..875630b9ef53 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
@@ -59,7 +59,7 @@
     <mkdir dir="${build.tmp}/default/branding.jar/idea" />
     <echoxml file="${build.tmp}/default/branding.jar/idea/IdeaApplicationInfo.xml">
       <component>
-        <version codename="MPS" major="2018" minor="2" eap="false" update-channel="MPS182" />
+        <version codename="MPS" major="2018" minor="3" eap="true" update-channel="MPS183EAP" />
         <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE" copyrightStart="2009" />
         <build number="${build.number}" date="${date}" />
         <logo url="/splash.png" textcolor="FFFFFF" progressColor="FFFFFF" progressX="117" progressY="280" progressHeight="3" />
@@ -77,9 +77,9 @@
         <help root="mps" webhelp-url="http://www.jetbrains.com/mps/webhelp/" />
         <documentation url="https://www.jetbrains.com/mps/documentation" />
         <support url="https://www.jetbrains.com/support/mps/index.html" />
-        <feedback release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
+        <feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
         <whatsnew url="https://www.jetbrains.com/mps/whatsnew/index.html" />
-        <keymap win="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" />
+        <keymap win="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" />
         <third-party url="http://www.jetbrains.org/" />
         <jetbrains-tv url="http://www.youtube.com/user/JetBrainsTV/search?query=MPS" />
         
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
index f8d9cdecd404..dd6dc1cd12fe 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
@@ -3,7 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
-  <property name="version" value="2018.2" />
+  <property name="version" value="2018.3 EAP" />
   <property name="idea_home" location="" />
   <property name="mps_home" location="${basedir}" />
   <property name="platform_lib" location="${basedir}/lib" />
diff --git a/plugins/mps-testing/META-INF/plugin.xml b/plugins/mps-testing/META-INF/plugin.xml
index 8da9a80aa7f1..7a45386c55a8 100644
--- a/plugins/mps-testing/META-INF/plugin.xml
+++ b/plugins/mps-testing/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Testing</name>
   <category>Custom Languages</category>
   <description>Languages unit-testing java code and MPS aspects such as editor and typesystem</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <depends>jetbrains.mps.core</depends>
   <depends>com.intellij.modules.lang</depends>
diff --git a/plugins/mpsdevkit/solution/devkit/actions.mps b/plugins/mpsdevkit/solution/devkit/actions.mps
index 4f6a25647c0a..0ce16e62f510 100644
--- a/plugins/mpsdevkit/solution/devkit/actions.mps
+++ b/plugins/mpsdevkit/solution/devkit/actions.mps
@@ -864,8 +864,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="MPS Languages DevKit" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="tC5Ba" id="56$IWKxe1aW">
     <property role="TrG5h" value="ProjectNewActionsEx" />
diff --git a/plugins/mpsdevkit/source_gen.caches/jetbrains/mps/ide/devkit/actions/generated b/plugins/mpsdevkit/source_gen.caches/jetbrains/mps/ide/devkit/actions/generated
index b076684771cb..29b618ff7ab3 100644
--- a/plugins/mpsdevkit/source_gen.caches/jetbrains/mps/ide/devkit/actions/generated
+++ b/plugins/mpsdevkit/source_gen.caches/jetbrains/mps/ide/devkit/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-4ih4bgcmisdyztk4t9gbnafydf00l67" />
+<dependencies version="2" modelHash="24j1ohnwouzsqahd6httcrziinrah6b" />
 
diff --git a/plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml b/plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
index c00f26dd16e0..55f1421d2f61 100644
--- a/plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
+++ b/plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jebrains.mps.ide.mpsdevkit</id>
   <name>MPS Languages DevKit</name>
   <description>Allows to develop new MPS languages</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/mpsmake/make/actions.mps b/plugins/mpsmake/make/actions.mps
index dd5c48600339..b12b12cceb8e 100644
--- a/plugins/mpsmake/make/actions.mps
+++ b/plugins/mpsmake/make/actions.mps
@@ -590,8 +590,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="Make" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
     <property role="2PJ1tZ" value="true" />
     <node concept="2Tc6Op" id="7_yYGx27If5" role="2Tc6Ou">
       <property role="2Tc6Oq" value="com.intellij.modules.mps" />
diff --git a/plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated b/plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated
index 46ff0539db2e..85907a76cf4f 100644
--- a/plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated
+++ b/plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-czpfmnvai38sc2kdciqakgegudrr4ad" />
+<dependencies version="2" modelHash="8gvt34sdv38gn20om4ttkztsyzgxev6" />
 
diff --git a/plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml b/plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
index 28dc022a35ad..d5f7f3b8cbec 100644
--- a/plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
+++ b/plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.ide.make</id>
   <name>Make</name>
   <description>Make IDE Integration</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   <depends>com.intellij.modules.mps</depends>
   
diff --git a/plugins/projectMigrations/META-INF/plugin.xml b/plugins/projectMigrations/META-INF/plugin.xml
index a9e15135feec..fd7e5d720bec 100644
--- a/plugins/projectMigrations/META-INF/plugin.xml
+++ b/plugins/projectMigrations/META-INF/plugin.xml
@@ -5,11 +5,11 @@
         >
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>jetbrains.mps.ide.mpsmigration</id>
-  <name>Migration 2018.2</name>
+  <name>Migration 2018.3</name>
   <description>Provides actions to migrate models and languages developed using previous versions of MPS</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/" logo="/MPS_16.png">JetBrains</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <depends>jetbrains.mps.ide.modelchecker</depends>
   <depends>jetbrains.mps.ide.java</depends>
diff --git a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps
index f1894f50899f..3fab01264f55 100644
--- a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps
+++ b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps
@@ -2343,9 +2343,9 @@
     <property role="9BnSL" value="VCS features in MPS" />
     <property role="9BnSM" value="JetBrains" />
     <property role="TrG5h" value="VCS Integration for MPS" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="1qHB85" value="/MPS_16.png" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="1ESbSp" id="10cWl49AXwe">
     <property role="TrG5h" value="IDEAChangesViewPopup" />
diff --git a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
index bcff6b197ab1..39ad13e1b337 100644
--- a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
+++ b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="8ywt7ao6ch908lp88nfbuon29fqeyl" />
+<dependencies version="2" modelHash="d4p1cc9a8xz0mwp1oakku1away30ngc" />
 
diff --git a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
index 99c808ec14dc..1cd3512a8845 100644
--- a/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
+++ b/plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.vcs</id>
   <name>VCS Integration for MPS</name>
   <description>VCS features in MPS</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/releaseNotes.txt b/releaseNotes.txt
index e8e7c4ee179a..8d5a79e9a5ba 100644
--- a/releaseNotes.txt
+++ b/releaseNotes.txt
@@ -1,3 +1,3 @@
-New Features in MPS 2018.2
+New Features in MPS 2018.3
 
 See more on MPS web site: http://www.jetbrains.com/mps/whatsnew/index.html
\ No newline at end of file
diff --git a/workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps b/workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
index a27d4097bbb3..dd5e2bb8a432 100644
--- a/workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
+++ b/workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
@@ -23472,8 +23472,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="TrG5h" value="IDE" />
     <property role="1qHB85" value="/MPS_16.png" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="sE7Ow" id="1JAxb5h3N20">
     <property role="TrG5h" value="EditGivenNode" />
diff --git a/workbench/mps-workbench/jetbrains.mps.ide/source_gen.caches/jetbrains/mps/ide/actions/generated b/workbench/mps-workbench/jetbrains.mps.ide/source_gen.caches/jetbrains/mps/ide/actions/generated
index 5e36c9783ba2..51d9b46ce9cb 100644
--- a/workbench/mps-workbench/jetbrains.mps.ide/source_gen.caches/jetbrains/mps/ide/actions/generated
+++ b/workbench/mps-workbench/jetbrains.mps.ide/source_gen.caches/jetbrains/mps/ide/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-e15fww890qs6l1ae9qxig80c0wi70rr" />
+<dependencies version="2" modelHash="9wyvz2fuofndye078r1bn9q5bdmekwd" />
 
diff --git a/workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml b/workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml
index 67342318aeb2..4a3f832aa4c9 100644
--- a/workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml
+++ b/workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jebrains.mps.ide</id>
   <name>IDE</name>
   <description>IDE core plugin</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
   
   
   <extensions defaultExtensionNs="com.intellij">
diff --git a/workbench/mps-workbench/source/idea/IdeaApplicationInfo.xml b/workbench/mps-workbench/source/idea/IdeaApplicationInfo.xml
index d9acb7040ef0..4b530961bcc7 100644
--- a/workbench/mps-workbench/source/idea/IdeaApplicationInfo.xml
+++ b/workbench/mps-workbench/source/idea/IdeaApplicationInfo.xml
@@ -1,9 +1,9 @@
 <component xmlns="http://jetbrains.org/intellij/schema/application-info"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://jetbrains.org/intellij/schema/application-info http://jetbrains.org/intellij/schema/ApplicationInfo.xsd">
-  <version codename="MPS" major="2018" minor="2" eap="true" update-channel="MPS182"/>
+  <version codename="MPS" major="2018" minor="3" eap="true" update-channel="MPS183"/>
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE" copyrightStart="2009"/>
-  <build number="MPS-182.SNAPSHOT" date="__BUILD_DATE__"/>
+  <build number="MPS-183.SNAPSHOT" date="__BUILD_DATE__"/>
   <!--<install-over minbuild="" maxbuild="" version=""/>-->
   <logo url="/splash.png" textcolor="FFFFFF" progressColor="FFFFFF" progressX="117" progressY="280" progressHeight="3"/>
   <about url="/about.png" foreground="FFFFFF" copyrightForeground="FFFFFF"/><!--linkColor="9b5121" logoX="300" logoY="265" logoW="75" logoH="30"-->