diff --git a/.run/Fabric Client & Server - Current.run.xml b/.run/Fabric Client & Server - Current.run.xml
new file mode 100644
index 000000000..ef1734a3f
--- /dev/null
+++ b/.run/Fabric Client & Server - Current.run.xml	
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Fabric Client &amp; Server - Current" type="CompoundRunConfigurationType" folderName="Fabric Client-Server">
+    <toRun name="Fabric Client (:fabric)" type="Application" />
+    <toRun name="Fabric Server (:fabric)" type="Application" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/coreSubProjects b/coreSubProjects
index d325a69e3..877a89d17 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit d325a69e3f725b24d00ddffebf17c146877c424e
+Subproject commit 877a89d17aa299b5ce075df9cda64161c6b33ca5