diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 479d86a1402..436b626f6bd 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
@@ -305,7 +305,7 @@ private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
 
     targetPlatform?.let {
         element.setAttribute("platform", it.oldFashionedDescription)
-        element.setAttribute("allPlatforms", it.componentPlatforms.map { it.serializeToString() }.joinToString(separator = "/"))
+        element.setAttribute("allPlatforms", it.componentPlatforms.map { it.serializeToString() }.sorted().joinToString(separator = "/"))
     }
     if (!useProjectSettings) {
         element.setAttribute("useProjectSettings", useProjectSettings.toString())
diff --git a/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/module.iml b/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/module.iml
new file mode 100644
index 00000000000..5183ddd1136
--- /dev/null
+++ b/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/module.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.6]/Native []" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
+        </compilerSettings>
+        <compilerArguments>
+          <option name="languageVersion" value="1.1" />
+          <option name="apiVersion" value="1.0" />
+        </compilerArguments>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="KotlinJavaRuntime (2)" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/projectFile.ipr b/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/projectFile.ipr
new file mode 100644
index 00000000000..a1407e2c8cd
--- /dev/null
+++ b/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/projectFile.ipr
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="CopyrightManager" default="" />
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/module.iml" filepath="$PROJECT_DIR$/module.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="libraryTable">
+    <library name="KotlinJavaRuntime (2)">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/../mockRuntime11/kotlin-runtime.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+      </SOURCES>
+    </library>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/src/foo.kt b/idea/testData/configuration/loadAndSaveProjectHMPPFacetConfig/src/foo.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
index d9161fe8b63..3787297ae14 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
@@ -116,6 +116,16 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest()
         Assert.assertEquals(moduleFileContentBefore.replace("platform=\"JVM 1.8\"", "platform=\"JVM 1.8\" allPlatforms=\"JVM [1.8]\""), moduleFileContentAfter)
     }
 
+    fun testLoadAndSaveProjectHMPPFacetConfig() {
+        val moduleFileContentBefore = String(module.moduleFile!!.contentsToByteArray())
+        val application = ApplicationManager.getApplication() as ApplicationImpl
+        application.isSaveAllowed = true
+        application.saveAll()
+        val moduleFileContentAfter = String(module.moduleFile!!.contentsToByteArray())
+        Assert.assertEquals(moduleFileContentBefore.replace("platform=\"JVM 1.8\"", "platform=\"JVM 1.8\" allPlatforms=\"JVM [1.8]\""), moduleFileContentAfter)
+    }
+
+
     fun testApiVersionWithoutLanguageVersion() {
         KotlinCommonCompilerArgumentsHolder.getInstance(myProject)
         val settings = myProject.getLanguageVersionSettings()