diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
index 392a14b78bbf..9c094e255ca9 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -582,7 +582,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
                                                        GenericDebuggerRunnerSettings settings,
                                                        boolean checkValidity)
     throws ExecutionException {
-    return createDebugParameters(parameters, settings.LOCAL, settings.getTransport(), settings.DEBUG_PORT, checkValidity);
+    return createDebugParameters(parameters, settings.LOCAL, settings.getTransport(), settings.getDebugPort(), checkValidity);
   }
 
   private static class MyDebuggerStateManager extends DebuggerStateManager {
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
index 06408ce2a27a..cba2d3ef9b67 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
@@ -134,7 +134,7 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
 
     if (debuggerRunnerSettings != null) {
       remoteConnection.setUseSockets(debuggerRunnerSettings.getTransport() == DebuggerSettings.SOCKET_TRANSPORT);
-      remoteConnection.setAddress(debuggerRunnerSettings.DEBUG_PORT);
+      remoteConnection.setAddress(debuggerRunnerSettings.getDebugPort());
     }
 
     return remoteConnection;
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
index 594aec895b59..ed6f45263b66 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,23 +17,29 @@ package com.intellij.debugger.impl;
 
 import com.intellij.debugger.settings.DebuggerSettings;
 import com.intellij.execution.configurations.DebuggingRunnerData;
-import com.intellij.execution.configurations.RunnerSettings;
-import com.intellij.openapi.util.DefaultJDOMExternalizer;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.WriteExternalException;
-import org.jdom.Element;
+import com.intellij.execution.configurations.RunnerSettingsEx;
+import com.intellij.util.xmlb.annotations.OptionTag;
+import com.intellij.util.xmlb.annotations.Transient;
 
-public class GenericDebuggerRunnerSettings implements RunnerSettings, DebuggingRunnerData {
+public class GenericDebuggerRunnerSettings extends RunnerSettingsEx implements DebuggingRunnerData {
+  @Transient
+  @Deprecated
   public String DEBUG_PORT = "";
+
   public int TRANSPORT = DebuggerSettings.SOCKET_TRANSPORT;
   public boolean LOCAL = true;
 
-  public GenericDebuggerRunnerSettings() {
+  @Override
+  @OptionTag("DEBUG_PORT")
+  public String getDebugPort() {
+    //noinspection deprecation
+    return DEBUG_PORT;
   }
 
   @Override
-  public String getDebugPort() {
-    return DEBUG_PORT;
+  public void setDebugPort(String port) {
+    //noinspection deprecation
+    DEBUG_PORT = port;
   }
 
   @Override
@@ -46,31 +52,12 @@ public class GenericDebuggerRunnerSettings implements RunnerSettings, DebuggingR
     LOCAL = isLocal;
   }
 
-  @Override
-  public void setDebugPort(String port) {
-    DEBUG_PORT = port;
+  @Transient
+  public int getTransport() {
+    return LOCAL ? DebuggerSettings.getInstance().DEBUGGER_TRANSPORT : TRANSPORT;
   }
 
   public void setTransport(int transport) {
     TRANSPORT = transport;
   }
-
-  @Override
-  public void readExternal(Element element) throws InvalidDataException {
-    DefaultJDOMExternalizer.readExternal(this, element);
-  }
-
-  @Override
-  public void writeExternal(Element element) throws WriteExternalException {
-    DefaultJDOMExternalizer.writeExternal(this, element);
-  }
-
-  public int getTransport() {
-    if (LOCAL) {
-      return DebuggerSettings.getInstance().DEBUGGER_TRANSPORT;
-    }
-    else {
-      return TRANSPORT;
-    }
-  }
 }
diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
index cefceb3977e0..c94b71966ad3 100644
--- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
+++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
@@ -205,7 +205,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
 
     GenericDebuggerRunnerSettings debuggerRunnerSettings = new GenericDebuggerRunnerSettings();
     debuggerRunnerSettings.LOCAL = true;
-    debuggerRunnerSettings.DEBUG_PORT = "3456";
+    debuggerRunnerSettings.setDebugPort("3456");
 
     ExecutionEnvironment environment = new ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance())
       .runnerSettings(debuggerRunnerSettings)
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java
index daf0053eda66..d34a18919883 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettingsEx.java b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettingsEx.java
new file mode 100644
index 000000000000..7deb4d4619d8
--- /dev/null
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettingsEx.java
@@ -0,0 +1,35 @@
+package com.intellij.execution.configurations;
+
+import com.intellij.util.xmlb.Accessor;
+import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
+import com.intellij.util.xmlb.XmlSerializer;
+import gnu.trove.THashSet;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+public abstract class RunnerSettingsEx implements RunnerSettings {
+  private final Set<String> mySerializedAccessorNameTracker = new THashSet<String>();
+  private final SkipDefaultValuesSerializationFilters mySerializationFilter = new SkipDefaultValuesSerializationFilters() {
+    @Override
+    protected boolean accepts(@NotNull Accessor accessor, @NotNull Object bean, @Nullable Object beanValue) {
+      if (mySerializedAccessorNameTracker.contains(accessor.getName())) {
+        return true;
+      }
+      return super.accepts(accessor, bean, beanValue);
+    }
+  };
+
+  @Override
+  public final void readExternal(Element element) {
+    mySerializedAccessorNameTracker.clear();
+    XmlSerializer.deserializeInto(this, element, mySerializedAccessorNameTracker);
+  }
+
+  @Override
+  public final void writeExternal(Element element) {
+    XmlSerializer.serializeInto(this, element, mySerializationFilter);
+  }
+}
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
index d0434b84c493..f979668495c4 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
@@ -262,9 +262,9 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
     }
 
     myUnloadedConfigurationPerRunnerSettings = null;
-    for (Element configurationElement : element.getChildren(CONFIGURATION_ELEMENT)) {
-      String id = configurationElement.getAttributeValue(RUNNER_ID);
-      ProgramRunner runner = RunnerRegistry.getInstance().findRunnerById(id);
+    for (Iterator<Element> iterator = element.getChildren(CONFIGURATION_ELEMENT).iterator(); iterator.hasNext(); ) {
+      Element configurationElement = iterator.next();
+      ProgramRunner runner = RunnerRegistry.getInstance().findRunnerById(configurationElement.getAttributeValue(RUNNER_ID));
       if (runner != null) {
         ConfigurationPerRunnerSettings settings = myConfiguration.createRunnerSettings(new InfoProvider(runner));
         if (settings != null) {
@@ -276,15 +276,16 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
         if (myUnloadedConfigurationPerRunnerSettings == null) {
           myUnloadedConfigurationPerRunnerSettings = new SmartList<Element>();
         }
+
+        iterator.remove();
         myUnloadedConfigurationPerRunnerSettings.add(configurationElement);
       }
     }
   }
 
   @Override
-  public void writeExternal(final Element element) throws WriteExternalException {
+  public void writeExternal(Element element) throws WriteExternalException {
     final ConfigurationFactory factory = myConfiguration.getFactory();
-
     if (!(myConfiguration instanceof UnknownRunConfiguration)) {
       element.setAttribute(TEMPLATE_FLAG_ATTRIBUTE, String.valueOf(myIsTemplate));
       if (!myIsTemplate) {
@@ -297,7 +298,9 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
       }
       //element.setAttribute(UNIQUE_ID, getUniqueID());
 
-      if (isEditBeforeRun()) element.setAttribute(EDIT_BEFORE_RUN, String.valueOf(true));
+      if (isEditBeforeRun()) {
+        element.setAttribute(EDIT_BEFORE_RUN, String.valueOf(true));
+      }
       if (myWasSingletonSpecifiedExplicitly || mySingleton != factory.isConfigurationSingletonByDefault()) {
         element.setAttribute(SINGLETON, String.valueOf(mySingleton));
       }
diff --git a/platform/util/src/com/intellij/util/xmlb/BeanBinding.java b/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
index 28d23331d090..57a13fe0e6d2 100644
--- a/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
@@ -129,10 +129,12 @@ class BeanBinding implements Binding {
     if (element == null) {
       return o;
     }
-    return deserializeInto(XmlSerializerImpl.newInstance(myBeanClass), element);
+    Object instance = XmlSerializerImpl.newInstance(myBeanClass);
+    deserializeInto(instance, element, null);
+    return instance;
   }
 
-  public Object deserializeInto(@NotNull Object result, @NotNull Element element) {
+  public void deserializeInto(@NotNull Object result, @NotNull Element element, @Nullable Set<String> accessorNameTracker) {
     Set<Binding> bindings = myPropertyBindings.keySet();
     MultiMap<Binding, Object> data = MultiMap.createSmartList();
     nextNode:
@@ -155,10 +157,11 @@ class BeanBinding implements Binding {
     }
 
     for (Binding binding : data.keySet()) {
+      if (accessorNameTracker != null) {
+        accessorNameTracker.add(myPropertyBindings.get(binding).getName());
+      }
       binding.deserialize(result, ArrayUtil.toObjectArray(data.get(binding)));
     }
-
-    return result;
   }
 
   @Override
diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
index 7dd7f6856cae..76fa9d08c0e1 100644
--- a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
+++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.net.URL;
+import java.util.Set;
 
 public class XmlSerializer {
   private static final SerializationFilter TRUE_FILTER = new SerializationFilter() {
@@ -101,8 +102,12 @@ public class XmlSerializer {
   }
 
   public static void deserializeInto(@NotNull Object bean, @NotNull Element element) {
+    deserializeInto(bean, element, null);
+  }
+
+  public static void deserializeInto(@NotNull Object bean, @NotNull Element element, @Nullable Set<String> accessorNameTracker) {
     try {
-      ((BeanBinding)XmlSerializerImpl.getBinding(bean.getClass())).deserializeInto(bean, element);
+      ((BeanBinding)XmlSerializerImpl.getBinding(bean.getClass())).deserializeInto(bean, element, accessorNameTracker);
     }
     catch (XmlSerializationException e) {
       throw e;