Clean-up TPs

* Eliminated unused features
* Gave uniform names and description to all .tpd files
* Reformatted all .tpd files to have uniform formatting so that it is
easy to compare the nightly, milestones and releases variants.
* Regenerated .target files accordingly
* Renamed common.tpd to base.tpd to avoid confusion with the "common"
feature
* Restructured the inclusion chains to better reflect dependencies as
follows:
  {tooling, codegen} include {core} includes {profile} includes
{papyrus} include {base}
  {releng,migration} includes {tooling}
  {rt.include} includes {papyrus}


Change-Id: Ib97e2e019fd5254b315444303f46ee865e128355
Signed-off-by: Ernesto Posse <eposse@gmail.com>
diff --git a/org.eclipse.papyrusrt.targetplatform/README.md b/org.eclipse.papyrusrt.targetplatform/README.md
index 11ea6eb..541576b 100644
--- a/org.eclipse.papyrusrt.targetplatform/README.md
+++ b/org.eclipse.papyrusrt.targetplatform/README.md
@@ -89,7 +89,7 @@
 * `papyrusnightly` — the latest Papyrus nightly
     * `org.eclipse.papyrusrt.targetplatform.core` — the Core component's target platform
         * `eclipse` — the variant for Eclipse build-server local downloads access
-    * the "portable" target plaform definition and generated target file with HTTP access
+    * the "portable" target platform definition and generated target file with HTTP access
 
 ### Maintenance
 
diff --git a/org.eclipse.papyrusrt.targetplatform/build.xml b/org.eclipse.papyrusrt.targetplatform/build.xml
index 3c1ca97..c8462a6 100644
--- a/org.eclipse.papyrusrt.targetplatform/build.xml
+++ b/org.eclipse.papyrusrt.targetplatform/build.xml
@@ -40,7 +40,7 @@
 			<regexpmapper from="(.*)/([^/]+\.target)$$" to="\1/eclipse/\2" handledirsep="true"/>
 			<filterchain>
 				<replacestring
-					from="http://download.eclipse.org/papyrus-rt/updates/nightly/neon/"
+					from="http://download.eclipse.org/papyrus-rt/updates/nightly/oxygen/"
 					to="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Product/lastSuccessful/archive/repository/" />
 				<replacestring
 					from="http://download.eclipse.org"
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.target
new file mode 100644
index 0000000..5aa0921
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.target
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus-RT milestones common target platform" sequenceNumber="1499961613">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.tpd
new file mode 100644
index 0000000..82bce85
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.base.tpd
@@ -0,0 +1,29 @@
+/**
+ * Base Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by all Papyrus-RT components in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones common target platform" with source requirements
+
+location "http://download.eclipse.org/staging/oxygen/" eclipse-staging {
+	org.eclipse.equinox.executable.feature.group lazy
+	org.eclipse.xtend.sdk.feature.group lazy
+	org.eclipse.uml2.feature.group [5.3.0,6.0.0)
+	org.eclipse.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/cbi/updates/license/" {
+	org.eclipse.license.feature.group [1.0.1,1.1.0)
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/" {
+	com.google.guava [21.0.0,21.0.1)
+	org.junit [4.0.0,5.0.0)
+	org.apache.log4j [1.2.0,1.3.0)
+	/* Egit/Jgit */
+	javaewah
+	org.apache.commons.compress
+	org.kohsuke.args4j
+	org.mockito [1.9.0,2.0.0)
+	org.hamcrest [1.1.0,2.0.0)
+}
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
index d944df4..136c105 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for CodeGen" sequenceNumber="1500394343">
+<target name="Papyrus-RT milestones codegen target platform" sequenceNumber="1499961680">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,38 +23,35 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
index 6c4f33f..cb918d2 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for CodeGen" sequenceNumber="1500394343">
+<target name="Papyrus-RT milestones codegen target platform" sequenceNumber="1499961680">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,38 +23,35 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
index b516314..14de90e 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
@@ -1,21 +1,15 @@
-// Target Platform for papyrus RT CodeGen, Based on 
-// * Basic TP for Papyrus RT including Papyrus and Designer release
-// * All the Papyrus RT features required by Codegen build
+/**
+ * Codegen Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT codegen component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones codegen target platform" with source requirements
 
+include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
-target "Papyrus Milestone TP for CodeGen" with source requirements
-
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
-
-// Last repo of Core Feature
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-  org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-}
-
-// Last repo of Profile Feature
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-  org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.target
deleted file mode 100644
index 37b2cbc..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.target
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestones TP Common" sequenceNumber="1500394278">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.tpd
deleted file mode 100644
index 1c2e871..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.common.tpd
+++ /dev/null
@@ -1,58 +0,0 @@
-// Target Platform for papyrus RT
-
-target "Papyrus Milestones TP Common" with source requirements
-
-location "http://download.eclipse.org/staging/oxygen/" eclipse-staging {
- org.eclipse.equinox.executable.feature.group lazy
- org.eclipse.xtend.sdk.feature.group lazy
- org.eclipse.uml2.feature.group [5.3.0, 6.0.0)
- org.eclipse.sdk.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
-	org.eclipse.papyrus.junit.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/nebula/releases/1.2.0/" nebula-release {
-	org.eclipse.nebula.cwt [1.0.0,2.0.0)
-}
-
-/**
- * EMF Compare and EGit, including dependencies
- */
-location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/" {
-	org.eclipse.emf.compare.diagram.gmf.feature.group
-	org.eclipse.emf.compare.diagram.papyrus.feature.group
-	org.eclipse.emf.compare.egit.feature.group
-	org.eclipse.emf.compare.feature.group
-	org.eclipse.emf.compare.ide.ui.feature.group
-	org.eclipse.emf.compare.rcp.ui.feature.group
-	org.eclipse.emf.compare.uml2.feature.group
-}
-location "http://download.eclipse.org/egit/updates-stable-nightly/" {
-	org.eclipse.egit.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license/" {
-	org.eclipse.license.feature.group [1.0.1,1.1.0)
-}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" {
-	com.google.guava [21.0.0, 21.0.1)
-	org.junit [4.0.0,5.0.0)
-	org.apache.log4j [1.2.0,1.3.0)
-	/* Egit/Jgit */
-	javaewah
-	org.apache.commons.compress
-	org.kohsuke.args4j
-	/* Egit/Jgit */
-	org.mockito [1.9.0,2.0.0)
-	org.hamcrest [1.1.0,2.0.0)
-}
-
-// Required for building Codegen and Cpp
-location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
-  org.eclipse.papyrus.designer.languages.cpp.feature.feature.group [1.0.4, 2.0.0)
-}
-
-location "http://download.eclipse.org/elk/updates/releases/0.1.0/" eclipse-elk {
-  org.eclipse.elk.sdk.feature.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
index 5e48b81..9be91b1 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Core" sequenceNumber="1500394329">
+<target name="Papyrus-RT milestones core target platform" sequenceNumber="1499961655">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
index 89cf0d7..0ae5bf8 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Core" sequenceNumber="1500394329">
+<target name="Papyrus-RT milestones core target platform" sequenceNumber="1499961655">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
index 191ac88..1e38872 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
@@ -1,15 +1,13 @@
-// Target Platform for papyrus RT, Based on 
-// * Eclipse Latest release
-// * Papyrus latest release
-// * Papyrus Designer latest release
-// * Papyrus Developer Latest successful Hudson build 
+/**
+ * Core Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT core component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones core target platform" with source requirements
 
-target "Papyrus Milestone TP for Core" with source requirements
+include "../org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd"
 
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
-
-// Master Profile Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-  org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
index 271c244..21756e1 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
@@ -1,7 +1,9 @@
-// Target Platform for the Papyrus RT Installer, based on 
-// * Eclipse Oomph Installer latest release
-
-target "Papyrus-RT Installer TP" with requirements
+/**
+ * Installer Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT installer component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones installer target platform" with requirements
 
 // Oomph Installer
 location "http://download.eclipse.org/oomph/products/repository/" oomph-updates {
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
index c6dde02..584306f 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1500394395">
+<target name="Papyrus-RT milestones migration target platform" sequenceNumber="1499961768">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -84,6 +58,28 @@
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
index fac65b5..27284d1 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1500394395">
+<target name="Papyrus-RT milestones migration target platform" sequenceNumber="1499961768">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -84,6 +58,28 @@
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
index 7de63c7..a2b399f 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
@@ -1,13 +1,15 @@
-// Target Platform for papyrus RT migration, with Papyrus-RT core
-target "Papyrus Nightly TP for Migration" with source requirements
+/**
+ * Migration Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT migration component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones migration target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd"
 
-// Master Tooling Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
index 5a88e08..34f5ba2 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP" sequenceNumber="1500394309">
+<target name="Papyrus-RT milestones Papyrus target platform" sequenceNumber="1499961627">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
index 06b5b53..970c960 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP" sequenceNumber="1500394309">
+<target name="Papyrus-RT milestones Papyrus target platform" sequenceNumber="1499961627">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
index 91d4881..badcba9 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
@@ -1,20 +1,23 @@
-// Target Platform for papyrus RT, Based on 
-// * Eclipse latest release
-// * Papyrus latest milestone build
-// * Papyrus required extras milestone build
-target "Papyrus Milestone TP" with source requirements
+/**
+ * Papyrus Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the Papyrus dependencies used by Papyrus-RT components in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones Papyrus target platform" with source requirements
 
-include "../org.eclipse.papyrusrt.targetplatform.common.tpd"
+include "../org.eclipse.papyrusrt.targetplatform.base.tpd"
 
 location "http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/" papyrus-milestone {
 	org.eclipse.papyrus.sdk.feature.feature.group lazy
-	// org.eclipse.papyrus.extra.dsml.validation.feature.feature.group lazy
-	// org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group lazy
 }
 
-// Papyrus Interoperability for RSA Migration
-location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
-	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
+	org.eclipse.papyrus.junit.feature.feature.group lazy
+}
+
+// Required for building Codegen and Cpp
+location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
+	org.eclipse.papyrus.designer.languages.cpp.feature.feature.group [1.0.4,2.0.0)
 }
 
 location "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" gmf-tooling {
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
index 5fc2384..58963af 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Profile" sequenceNumber="1500394319">
+<target name="Papyrus-RT milestones profile target platform" sequenceNumber="1499961642">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
index a4373c4..9a41dda 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Profile" sequenceNumber="1500394319">
+<target name="Papyrus-RT milestones profile target platform" sequenceNumber="1499961642">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
index a656313..4fb1949 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
@@ -1,8 +1,9 @@
-// Target Platform for papyrus RT, with required dependencies for Profile component.
-
-target "Papyrus Milestone TP for Profile" with source requirements
-
+/**
+ * Profile Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT profile component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones profile target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
index 112be8a..68bd2e6 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Releng" sequenceNumber="1500394382">
+<target name="Papyrus-RT milestones releng target platform" sequenceNumber="1499961729">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,10 +11,57 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
+      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
       <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
     </location>
@@ -33,57 +80,6 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
-      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
index 93f453a..2310699 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Releng" sequenceNumber="1500394382">
+<target name="Papyrus-RT milestones releng target platform" sequenceNumber="1499961729">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,10 +11,57 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
+      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
       <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
     </location>
@@ -33,57 +80,6 @@
       <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
-      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
index 8be8231..16f0100 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
@@ -1,48 +1,27 @@
-// Target Platform for papyrus RT, Based on 
-// * Eclipse latest release
-// * Papyrus latest release
-// * Papyrus Designer latest release
-// * Papyrus Developer latest successful Hudson build
+/**
+ * Releng Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the the Papyrus-RT features in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones releng target platform" with source requirements
 
-target "Papyrus Milestone TP for Releng" with source requirements
+include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd" 
 
-// Basic Target Platform with eclipse release and Papyrus
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd" 
-
-
-// Master Profile Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-  org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
-}
-
-// Master Core Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-  org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
-}
-
+// Master Profile and Core are included in the Tooling TP
 
 // Master Tooling Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group lazy
 }
 
 // Master Codegen Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Codegen/lastSuccessfulBuild/artifact/repository/" papyrus-rt-codegen {
-  org.eclipse.papyrusrt.codegen-feature.feature.group lazy
-  org.eclipse.papyrusrt.rts-feature.feature.group lazy
-  org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group lazy
-}
\ No newline at end of file
+	org.eclipse.papyrusrt.codegen-feature.feature.group lazy
+	org.eclipse.papyrusrt.rts-feature.feature.group lazy
+	org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group lazy
+}
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
index 7ea6131..7627985 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone with full Papyrus RT TP" sequenceNumber="1500394410">
+<target name="Papyrus-RT milestones full target platform" sequenceNumber="1499961755">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -70,10 +44,11 @@
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-RT-master" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/nightly/oxygen/"/>
+      <repository id="eclipse-papyrus-RT-master" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Product/lastSuccessful/archive/repository/"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
index 8249a63..73f5337 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone with full Papyrus RT TP" sequenceNumber="1500394410">
+<target name="Papyrus-RT milestones full target platform" sequenceNumber="1499961755">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -70,6 +44,7 @@
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
index 71ff8f5..1314e28 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
@@ -1,13 +1,17 @@
-// Target Platform for papyrus RT, with Papyrus-RT fully available
-
-target "Papyrus Milestone with full Papyrus RT TP" with source requirements
+/**
+ * Full Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the Papyrus-RT features in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones full target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-// Includes full Papyrus RT features
+// Includes all Papyrus-RT features
 location "http://download.eclipse.org/papyrus-rt/updates/nightly/oxygen/" eclipse-papyrus-RT-master {
 	org.eclipse.papyrusrt.feature.feature.group lazy
 	org.eclipse.papyrusrt.codegen-feature.feature.group lazy
+	org.eclipse.papyrusrt.rts-feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
index 1ff2501..bffa5a9 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Tooling" sequenceNumber="1500394359">
+<target name="Papyrus-RT milestones tooling target platform" sequenceNumber="1499961708">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -83,5 +57,27 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
index a30f93d..b7863f4 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Milestone TP for Tooling" sequenceNumber="1500394359">
+<target name="Papyrus-RT milestones tooling target platform" sequenceNumber="1499961708">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -45,23 +23,19 @@
       <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
       <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-milestone" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
@@ -83,5 +57,27 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
index a20820f..0538fc2 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusmilestone/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
@@ -1,7 +1,9 @@
-// Target Platform for papyrus RT, Based on 
-// * Papyrus-RT core dependencies
-// * Papyrus-RT core latest build
-target "Papyrus Milestone TP for Tooling" with source requirements
+/**
+ * Tooling Target Platform for Papyrus-RT (milestones)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT tooling component in the milestones versions of Papyrus-RT.
+ */
+target "Papyrus-RT milestones tooling target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
@@ -15,3 +17,28 @@
 	org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
 }
+
+// Papyrus Interoperability for RSA Migration
+location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
+	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
+}
+
+location "http://download.eclipse.org/nebula/releases/1.2.0/" nebula-release {
+	org.eclipse.nebula.cwt [1.0.0,2.0.0)
+}
+
+// EMF Compare and EGit, including dependencies
+location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/" {
+	org.eclipse.emf.compare.diagram.gmf.feature.group
+	org.eclipse.emf.compare.diagram.papyrus.feature.group
+	org.eclipse.emf.compare.egit.feature.group
+	org.eclipse.emf.compare.feature.group
+	org.eclipse.emf.compare.ide.ui.feature.group
+	org.eclipse.emf.compare.rcp.ui.feature.group
+	org.eclipse.emf.compare.uml2.feature.group
+}
+
+location "http://download.eclipse.org/egit/updates-stable-nightly/" {
+	org.eclipse.egit.feature.group lazy
+}
+
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.target
new file mode 100644
index 0000000..fe9da28
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.target
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus-RT nightly base target platform" sequenceNumber="1499959591">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.tpd
new file mode 100644
index 0000000..c4a16fd
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.base.tpd
@@ -0,0 +1,30 @@
+/**
+ * Base Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by all Papyrus-RT components in the nightly version of Papyrus-RT.
+ */
+target "Papyrus-RT nightly base target platform" with source requirements
+
+location "http://download.eclipse.org/staging/oxygen/" eclipse-staging {
+	org.eclipse.equinox.executable.feature.group lazy
+	org.eclipse.xtend.sdk.feature.group lazy
+	org.eclipse.uml2.feature.group lazy
+	org.eclipse.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/cbi/updates/license/" {
+	org.eclipse.license.feature.group [1.0.1,1.1.0)
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" {
+	com.google.guava [21.0.0,22.0.0)
+	org.junit [4.0.0,5.0.0)
+	org.apache.log4j [1.2.0,1.3.0)
+	/* Egit/Jgit */
+	javaewah
+	org.apache.commons.compress
+	org.kohsuke.args4j
+	org.mockito [1.9.0,2.0.0)
+	org.hamcrest [1.1.0,2.0.0)
+}
+
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
index 8fc2895..ab05156 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for CodeGen" sequenceNumber="1498746439">
+<target name="Papyrus-RT nightly codegen target platform" sequenceNumber="1499959720">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -41,36 +26,25 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
@@ -79,9 +53,5 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
index 59fd610..2a0ff92 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for CodeGen" sequenceNumber="1498746439">
+<target name="Papyrus-RT nightly codegen target platform" sequenceNumber="1499959720">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -41,36 +26,25 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
@@ -79,9 +53,5 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
index f2b4658..7b0160e 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
@@ -1,14 +1,11 @@
-// Target Platform for papyrus RT CodeGen, Based on 
-// * Basic TP for Papyrus RT including Papyrus and Designer release
-// * All the Papyrus RT features required by Codegen build
+/**
+ * Codegen Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT codegen component in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly codegen target platform" with source requirements
 
-target "Papyrus Nightly TP for CodeGen" with source requirements
-
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
-
-location "http://download.eclipse.org/staging/oxygen/" eclipse-staging {
-	org.eclipse.xtext.sdk.feature.group lazy
-}
+include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
 	org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
@@ -16,7 +13,3 @@
 	org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
 }
-
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-	org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-}
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.target
deleted file mode 100644
index 076411a..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.target
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP Common" sequenceNumber="1497970535">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.tpd
deleted file mode 100644
index 8ab3b29..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.common.tpd
+++ /dev/null
@@ -1,58 +0,0 @@
-// Target Platform for papyrus RT
-
-target "Papyrus Nightly TP Common" with source requirements
-
-location "http://download.eclipse.org/staging/oxygen/" eclipse-staging {
- org.eclipse.equinox.executable.feature.group lazy
- org.eclipse.xtend.sdk.feature.group lazy
- org.eclipse.uml2.feature.group lazy
- org.eclipse.sdk.feature.group lazy
-}
-
-location "http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0" ocl-nightly {
-	org.eclipse.ocl.master.feature.group lazy
-}
-
-location "http://download.eclipse.org/nebula/releases/latest/" nebula-release {
-	org.eclipse.nebula.cwt lazy
-}
-
-/**
- * EMF Compare and EGit, including dependencies
- */
-location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/" {
-	org.eclipse.emf.compare.diagram.gmf.feature.group lazy
-	org.eclipse.emf.compare.diagram.papyrus.feature.group lazy
-	org.eclipse.emf.compare.egit.feature.group lazy
-	org.eclipse.emf.compare.feature.group lazy
-	org.eclipse.emf.compare.ide.ui.feature.group lazy
-	org.eclipse.emf.compare.rcp.ui.feature.group lazy
-	org.eclipse.emf.compare.uml2.feature.group lazy
-}
-location "http://download.eclipse.org/egit/updates-stable-nightly/" {
-	org.eclipse.egit.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license/" {
-	org.eclipse.license.feature.group [1.0.1,1.1.0)
-}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" {
-	com.google.guava [21.0.0, 22.0.0)
-	org.junit [4.0.0,5.0.0)
-	org.apache.log4j [1.2.0,1.3.0)
-	/* Egit/Jgit */
-	javaewah
-	org.apache.commons.compress
-	org.kohsuke.args4j
-	/* Egit/Jgit */
-	org.mockito [1.9.0,2.0.0)
-	org.hamcrest [1.1.0,2.0.0)
-}
-
-// Required for building Codegen and Cpp
-location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
-  org.eclipse.papyrus.designer.languages.cpp.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/elk/updates/releases/0.1.0/" eclipse-elk {
-  org.eclipse.elk.sdk.feature.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
index a7c6c18..1400506 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Core" sequenceNumber="1498746437">
+<target name="Papyrus-RT nightly core target platform" sequenceNumber="1499959692">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
index a45a72a..107c87a 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Core" sequenceNumber="1498746437">
+<target name="Papyrus-RT nightly core target platform" sequenceNumber="1499959692">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
index f34e0cc..a8f1815 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
@@ -1,7 +1,9 @@
-// Target Platform for papyrus RT, with required dependencies for Core component.
-
-target "Papyrus Nightly TP for Core" with source requirements
-
+/**
+ * Core Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT core component in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly core target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd"
 
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
index 1f49fd6..b506770 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
@@ -1,7 +1,9 @@
-// Target Platform for the Papyrus RT Installer, based on 
-// * Eclipse Oomph Installer latest release
-
-target "Papyrus-RT Installer TP" with requirements
+/**
+ * Installer Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT installer component in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly installer target platform" with requirements
 
 // Oomph Installer
 location "http://download.eclipse.org/oomph/products/latest/repository/" oomph-updates {
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
index bf7a73f..2478893 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1498746454">
+<target name="Papyrus-RT nightly migration target platform" sequenceNumber="1499959733">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
@@ -88,6 +58,28 @@
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
index 38436ad..cd1244b 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1498746454">
+<target name="Papyrus-RT nightly migration target platform" sequenceNumber="1499959733">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
@@ -88,6 +58,28 @@
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
index 7de63c7..2423e85 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
@@ -1,13 +1,15 @@
-// Target Platform for papyrus RT migration, with Papyrus-RT core
-target "Papyrus Nightly TP for Migration" with source requirements
+/**
+ * Migration Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT migration component in the nightly version of Papyrus-RT.
+ */
+target "Papyrus-RT nightly migration target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd"
 
-// Master Tooling Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
index 2dd68b8..f385e13 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP" sequenceNumber="1498746426">
+<target name="Papyrus-RT nightly Papyrus target platform" sequenceNumber="1499959606">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
index 21279da..9034f6c 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP" sequenceNumber="1498746426">
+<target name="Papyrus-RT nightly Papyrus target platform" sequenceNumber="1499959606">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
index 6c9d8ac..5ffe85b 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
@@ -1,22 +1,25 @@
-// Target Platform for papyrus RT
-target "Papyrus Nightly TP" with source requirements
+/**
+ * Papyrus Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the Papyrus dependencies used by Papyrus-RT components in the nightly version of Papyrus-RT.
+ */
+target "Papyrus-RT nightly Papyrus target platform" with source requirements
 
-include "../org.eclipse.papyrusrt.targetplatform.common.tpd"
+include "../org.eclipse.papyrusrt.targetplatform.base.tpd"
 
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" papyrus-nightly {
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/" papyrus-nightly {
 	org.eclipse.papyrus.sdk.feature.feature.group lazy
-	// org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group lazy
-}
-
-// Papyrus Interoperability for RSA Migration
-location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
-	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
 }
 
 location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
 	org.eclipse.papyrus.junit.feature.feature.group lazy
 }
 
+// Required for building Codegen and Cpp
+location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
+	org.eclipse.papyrus.designer.languages.cpp.feature.feature.group lazy
+}
+
 location "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" gmf-tooling {
 	org.eclipse.gmf.tooling lazy
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
index ae45b80..c342792 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Profile" sequenceNumber="1498746431">
+<target name="Papyrus-RT nightly profile target platform" sequenceNumber="1499959680">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
index 059bdd0..bc96b0d 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Profile" sequenceNumber="1498746431">
+<target name="Papyrus-RT nightly profile target platform" sequenceNumber="1499959680">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
index 9f3bcdf..a8f4197 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
@@ -1,8 +1,9 @@
-// Target Platform for papyrus RT, with required dependencies for Profile component.
-
-target "Papyrus Nightly TP for Profile" with source requirements
-
+/**
+ * Profile Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT profile component in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly profile target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
index ecd97d2..9c29837 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Releng" sequenceNumber="1498746462">
+<target name="Papyrus-RT nightly releng target platform" sequenceNumber="1499959744">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,8 +11,55 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
+      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
@@ -33,61 +80,6 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
-      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
index efee6ee..5006319 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Releng" sequenceNumber="1498746462">
+<target name="Papyrus-RT nightly releng target platform" sequenceNumber="1499959744">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,8 +11,55 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
+      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
+      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
@@ -33,61 +80,6 @@
       <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
-      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
index 6564368..db19de5 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
@@ -1,44 +1,27 @@
-// Target Platform for papyrus RT, based on papyrus, plus components of Papyrus-RT
+/**
+ * Releng Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the the Papyrus-RT features in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly releng target platform" with source requirements
 
-target "Papyrus Nightly TP for Releng" with source requirements
+include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd" 
 
-// Basic Target Platform with Release eclipse and Papyrus
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd" 
-
-
-// Master Profile Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-  org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
-}
-
-// Master Core Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-  org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
-}
-
+// Master Profile and Core are included in the Tooling TP
 
 // Master Tooling Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group lazy
 }
 
 // Master Codegen Features
 location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Codegen/lastSuccessfulBuild/artifact/repository/" papyrus-rt-codegen {
-  org.eclipse.papyrusrt.codegen-feature.feature.group lazy
-  org.eclipse.papyrusrt.rts-feature.feature.group lazy
-  org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group lazy
-}
\ No newline at end of file
+	org.eclipse.papyrusrt.codegen-feature.feature.group lazy
+	org.eclipse.papyrusrt.rts-feature.feature.group lazy
+	org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group lazy
+}
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
index 8f98b1d..5cdb0f0 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly with full Papyrus RT TP" sequenceNumber="1498746459">
+<target name="Papyrus-RT nightly full target platform" sequenceNumber="1499959753">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,32 +26,25 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
index 86f8128..be50757 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly with full Papyrus RT TP" sequenceNumber="1498746459">
+<target name="Papyrus-RT nightly full target platform" sequenceNumber="1499959753">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,36 +26,29 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-RT-master" location="http://download.eclipse.org/papyrus-rt/updates/nightly/neon/"/>
+      <repository id="eclipse-papyrus-RT-master" location="http://download.eclipse.org/papyrus-rt/updates/nightly/oxygen/"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
index 177429c..8f3803c 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
@@ -1,13 +1,17 @@
-// Target Platform for papyrus RT, based on Papyrus and Papyrus-RT fully installed
-
-target "Papyrus Nightly with full Papyrus RT TP" with source requirements
+/**
+ * Full Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the Papyrus-RT features in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly full target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-// Includes full Papyrus RT features
-location "http://download.eclipse.org/papyrus-rt/updates/nightly/neon/" eclipse-papyrus-RT-master {
+// Includes all Papyrus-RT features
+location "http://download.eclipse.org/papyrus-rt/updates/nightly/oxygen/" eclipse-papyrus-RT-master {
 	org.eclipse.papyrusrt.feature.feature.group lazy
 	org.eclipse.papyrusrt.codegen-feature.feature.group lazy
+	org.eclipse.papyrusrt.rts-feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
index 0319c8c..f146dc2 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Tooling" sequenceNumber="1498746451">
+<target name="Papyrus-RT nightly tooling target platform" sequenceNumber="1499959711">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="file:/home/data/httpd/download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
@@ -87,5 +57,27 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
index 65c94f6..fe723a0 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Tooling" sequenceNumber="1498746451">
+<target name="Papyrus-RT nightly tooling target platform" sequenceNumber="1499959711">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -11,28 +11,6 @@
       <repository id="eclipse-staging" location="http://download.eclipse.org/staging/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
-      <repository id="ocl-nightly" location="http://download.eclipse.org/modeling/mdt/ocl/updates/nightly/6.3.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,26 +26,18 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <repository id="papyrus-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="0.0.0"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
@@ -87,5 +57,27 @@
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
       <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="0.0.0"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/egit/updates-stable-nightly/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
index 6738ab8..c7bcc7a 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusnightly/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
@@ -1,5 +1,9 @@
-// Target Platform for papyrus RT tooling, with Papyrus-RT core
-target "Papyrus Nightly TP for Tooling" with source requirements
+/**
+ * Tooling Target Platform for Papyrus-RT (nightly)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT tooling component in the nightly versions of Papyrus-RT.
+ */
+target "Papyrus-RT nightly tooling target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
@@ -13,3 +17,28 @@
 	org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
 	org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
 }
+
+// Papyrus Interoperability for RSA Migration
+location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
+	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
+}
+
+location "http://download.eclipse.org/nebula/releases/latest/" nebula-release {
+	org.eclipse.nebula.cwt lazy
+}
+
+// EMF Compare and EGit, including dependencies
+location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/" {
+	org.eclipse.emf.compare.diagram.gmf.feature.group lazy
+	org.eclipse.emf.compare.diagram.papyrus.feature.group lazy
+	org.eclipse.emf.compare.egit.feature.group lazy
+	org.eclipse.emf.compare.feature.group lazy
+	org.eclipse.emf.compare.ide.ui.feature.group lazy
+	org.eclipse.emf.compare.rcp.ui.feature.group lazy
+	org.eclipse.emf.compare.uml2.feature.group lazy
+}
+
+location "http://download.eclipse.org/egit/updates-stable-nightly/" {
+	org.eclipse.egit.feature.group lazy
+}
+
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.target
new file mode 100644
index 0000000..2a85fa6
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.target
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus-RT releases base target platform" sequenceNumber="1499875778">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
+      <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+      <unit id="org.mockito" version="1.9.5.v201605172210"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.tpd
new file mode 100644
index 0000000..c0eab30
--- /dev/null
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.base.tpd
@@ -0,0 +1,29 @@
+/**
+ * Base Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by all Papyrus-RT components in the release versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases base target platform" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" eclipse-release {
+	org.eclipse.equinox.executable.feature.group
+	org.eclipse.xtend.sdk.feature.group
+	org.eclipse.uml2.feature.group
+	org.eclipse.sdk.feature.group
+}
+
+location "http://download.eclipse.org/cbi/updates/license/" {
+	org.eclipse.license.feature.group [1.0.1,1.1.0)
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/" {
+	com.google.guava [21.0.0,21.0.1)
+	org.junit [4.0.0,5.0.0)
+	org.apache.log4j [1.2.0,1.3.0)
+	/* Egit/Jgit */
+	javaewah
+	org.apache.commons.compress
+	org.kohsuke.args4j
+	org.mockito [1.9.0,2.0.0)
+	org.hamcrest [1.1.0,2.0.0)
+}
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
index 2cd1c54..6fa034c 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/eclipse/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for CodeGen" sequenceNumber="1498746400">
+<target name="Papyrus-RT releases codegen target platform" sequenceNumber="1500403815">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,36 +26,29 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
index 8b5ed8a..ea46bf3 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for CodeGen" sequenceNumber="1498746400">
+<target name="Papyrus-RT releases codegen target platform" sequenceNumber="1500403815">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,36 +26,29 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
index 14b64fa..50f1b84 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.codegen/org.eclipse.papyrusrt.targetplatform.codegen.tpd
@@ -1,16 +1,15 @@
-// Target Platform for papyrus RT CodeGen, Based on 
-// * Basic TP for Papyrus RT including Papyrus and Designer release
-// * All the Papyrus RT features required by Codegen build
-
-
-target "Papyrus Release TP for CodeGen" with source requirements
+/**
+ * Codegen Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT codegen component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases codegen target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
-// Last repo of Core Feature
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-  org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.umlrt.core.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.common.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.target
deleted file mode 100644
index 3646953..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.target
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP Common" sequenceNumber="1498741947">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
-      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
-      <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
-      <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.1.0.201607121925"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-  </locations>
-</target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.tpd
deleted file mode 100644
index 1e0ee3b..0000000
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.common.tpd
+++ /dev/null
@@ -1,57 +0,0 @@
-// Target Platform for papyrus RT
-target "Papyrus Release TP Common" with source requirements
-
-location "http://download.eclipse.org/releases/oxygen/" eclipse-release {
- org.eclipse.equinox.executable.feature.group 
- org.eclipse.xtext.sdk.feature.group 
- org.eclipse.uml2.feature.group
- org.eclipse.sdk.feature.group
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
-	org.eclipse.papyrus.junit.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/nebula/releases/1.2.0/" nebula-release {
-	org.eclipse.nebula.cwt [1.0.0,2.0.0)
-}
-
-/**
- * EMF Compare and EGit, including dependencies
- */
-location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/" {
-	org.eclipse.emf.compare.diagram.gmf.feature.group
-	org.eclipse.emf.compare.diagram.papyrus.feature.group
-	org.eclipse.emf.compare.egit.feature.group
-	org.eclipse.emf.compare.feature.group
-	org.eclipse.emf.compare.ide.ui.feature.group
-	org.eclipse.emf.compare.rcp.ui.feature.group
-	org.eclipse.emf.compare.uml2.feature.group
-}
-location "http://download.eclipse.org/egit/updates/" {
-	org.eclipse.egit.feature.group lazy
-}
-location "http://download.eclipse.org/cbi/updates/license/" {
-	org.eclipse.license.feature.group [1.0.1,1.1.0)
-}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/" {
-	com.google.guava [21.0.0,21.0.1)
-	org.junit [4.0.0,5.0.0)
-	org.apache.log4j [1.2.0,1.3.0)
-	/* Egit/Jgit */
-	javaewah
-	org.apache.commons.compress
-	org.kohsuke.args4j
-	/* Egit/Jgit */
-	org.mockito [1.9.0,2.0.0)
-	org.hamcrest [1.1.0,2.0.0)
-}
-
-// Required for building Codegen and Cpp
-location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
-  org.eclipse.papyrus.designer.languages.cpp.feature.feature.group [1.0.4,2.0.0)
-}
-
-location "http://download.eclipse.org/elk/updates/releases/0.1.0/" eclipse-elk {
-  org.eclipse.elk.sdk.feature.feature.group
-}
\ No newline at end of file
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
index c6a89bf..8de8e11 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/eclipse/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Core" sequenceNumber="1498746396">
+<target name="Papyrus-RT releases core target platform" sequenceNumber="1500403617">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,29 +26,25 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
index 743f1c0..0b8a378 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Core" sequenceNumber="1498746396">
+<target name="Papyrus-RT releases core target platform" sequenceNumber="1500403617">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,29 +26,25 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
index 4fbd4d7..b31f963 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd
@@ -1,10 +1,13 @@
-// Target Platform for papyrus RT
-target "Papyrus Release TP for Core" with source requirements
+/**
+ * Core Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT core component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases core target platform" with source requirements
 
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
+include "../org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd"
 
-// Master Profile Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-	org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.umlrt.profile.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
index 2f8198e..42c42dd 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.installer/org.eclipse.papyrusrt.targetplatform.installer.tpd
@@ -1,7 +1,9 @@
-// Target Platform for the Papyrus RT Installer, based on 
-// * Eclipse Oomph Installer latest release
-
-target "Papyrus-RT Installer TP" with requirements
+/**
+ * Installer Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT installer component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases installer target platform" with requirements
 
 // Oomph Installer
 location "http://download.eclipse.org/oomph/products/repository/" oomph-updates {
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
index f790af3..ec51a38 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/eclipse/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1498746407">
+<target name="Papyrus-RT releases migration target platform" sequenceNumber="1500403864">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,31 +26,48 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
@@ -81,14 +76,9 @@
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-tooling" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Tooling/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
index c82fde8..40a5e0d 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Nightly TP for Migration" sequenceNumber="1498746407">
+<target name="Papyrus-RT releases migration target platform" sequenceNumber="1500403864">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,31 +26,48 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="http://download.eclipse.org/egit/updates/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
@@ -81,14 +76,9 @@
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-tooling" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
index 7de63c7..b63735d 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.migration/org.eclipse.papyrusrt.targetplatform.migration.tpd
@@ -1,13 +1,15 @@
-// Target Platform for papyrus RT migration, with Papyrus-RT core
-target "Papyrus Nightly TP for Migration" with source requirements
+/**
+ * Migration Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT migration component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases migration target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd"
 
-// Master Tooling Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
index fab437d..4fe8583 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/eclipse/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP" sequenceNumber="1498746380">
+<target name="Papyrus-RT releases Papyrus target platform" sequenceNumber="1499875806">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,20 +26,16 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
index c8ada92..cd47293 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP" sequenceNumber="1498746380">
+<target name="Papyrus-RT releases Papyrus target platform" sequenceNumber="1499875806">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,20 +26,16 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
index 1c1893f..e75310a 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd
@@ -1,16 +1,23 @@
-// Target Platform for papyrus RT
-target "Papyrus Release TP" with source requirements
+/**
+ * Papyrus Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the Papyrus dependencies used by Papyrus-RT components in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases Papyrus target platform" with source requirements
 
-include "../org.eclipse.papyrusrt.targetplatform.common.tpd" 
+include "../org.eclipse.papyrusrt.targetplatform.base.tpd"
 
 location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/" papyrus-release {
-  org.eclipse.papyrus.sdk.feature.feature.group
-  // org.eclipse.papyrus.infra.gmfdiag.elk.feature.feature.group
+	org.eclipse.papyrus.sdk.feature.feature.group
 }
 
-// Papyrus Interoperability for RSA Migration
-location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
-	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
+	org.eclipse.papyrus.junit.feature.feature.group lazy
+}
+
+// Required for building Codegen and Cpp
+location "http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/" eclipse-papyrus-designer {
+	org.eclipse.papyrus.designer.languages.cpp.feature.feature.group [1.0.4,2.0.0)
 }
 
 location "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" gmf-tooling {
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
index 454b695..5df3cfd 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/eclipse/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Profile" sequenceNumber="1498746387">
+<target name="Papyrus-RT releases profile target platform" sequenceNumber="1499894894">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,20 +26,16 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
index 651aea4..992be66 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Profile" sequenceNumber="1498746387">
+<target name="Papyrus-RT releases profile target platform" sequenceNumber="1499894894">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,20 +26,16 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
index 906e9ff..cad2320 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.profile/org.eclipse.papyrusrt.targetplatform.profile.tpd
@@ -1,8 +1,9 @@
-// Target Platform for papyrus RT, with required dependencies for Profile component.
-
-target "Papyrus Release TP for Profile" with source requirements
-
+/**
+ * Profile Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT profile component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases profile target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
index ba14410..001ae59 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/eclipse/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Releng" sequenceNumber="1498746415">
+<target name="Papyrus-RT releases releng target platform" sequenceNumber="1500403876">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,55 +26,64 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-tooling" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Tooling/lastSuccessful/archive/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-codegen" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Codegen/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
index 663bc76..ff74170 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Releng" sequenceNumber="1498746415">
+<target name="Papyrus-RT releases releng target platform" sequenceNumber="1500403876">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,55 +26,64 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
+      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="http://download.eclipse.org/egit/updates/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-tooling" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-codegen" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Codegen/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
index b7797d7..8e64eb1 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.releng/org.eclipse.papyrusrt.targetplatform.releng.tpd
@@ -1,43 +1,23 @@
-// Target Platform for papyrus RT
-target "Papyrus Release TP for Releng" with source requirements
+/**
+ * Releng Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the the Papyrus-RT features in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases releng target platform" with source requirements
 
-// Basic Target Platform with Release eclipse and Papyrus
-include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd" 
+include "../org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd" 
 
+// Master Profile and Core are included in the Tooling TP
 
-// Master Profile Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/" papyrus-rt-profile {
-  org.eclipse.papyrusrt.umlrt.profile.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group lazy
+// Master Tooling and Codegen Features
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group
+	org.eclipse.papyrusrt.codegen-feature.feature.group
+	org.eclipse.papyrusrt.rts-feature.feature.group
+	org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group
 }
-
-// Master Core Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-  org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
-}
-
-
-// Master Tooling Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Tooling/lastSuccessfulBuild/artifact/repository/" papyrus-rt-tooling {
-  org.eclipse.papyrusrt.umlrt.tooling.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
-  
-  org.eclipse.papyrusrt.umlrt.tooling.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.tooling.compare.feature.source.feature.group lazy
-  org.eclipse.papyrusrt.umlrt.migration.rsa.feature.source.feature.group lazy
-}
-
-// Master Codegen Features
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Codegen/lastSuccessfulBuild/artifact/repository/" papyrus-rt-codegen {
-  org.eclipse.papyrusrt.codegen-feature.feature.group lazy
-  org.eclipse.papyrusrt.rts-feature.feature.group lazy
-  org.eclipse.papyrusrt.xtumlrt.xtext.feature.feature.group lazy
-}
\ No newline at end of file
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
index d79662d..ebe417b 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/eclipse/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release with full Papyrus RT TP" sequenceNumber="1498746419">
+<target name="Papyrus-RT releases full target platform" sequenceNumber="1500403913">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,32 +26,29 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.feature.feature.group" version="1.0.0.201707181737"/>
+      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-RT-master" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Product/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
index a0a5e33..2942af6 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release with full Papyrus RT TP" sequenceNumber="1498746419">
+<target name="Papyrus-RT releases full target platform" sequenceNumber="1500403913">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,32 +26,29 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
-      <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
       <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrusrt.feature.feature.group" version="1.0.0.201707181737"/>
+      <unit id="org.eclipse.papyrusrt.codegen-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.rts-feature.feature.group" version="1.0.0.201707181457"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group" version="1.0.0.201707181457"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-RT-master" location="http://download.eclipse.org/papyrus-rt/updates/nightly/neon/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group" version="1.0.0.201707181457"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
index bd948e5..a67dd49 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.rt.included/org.eclipse.papyrusrt.targetplatform.rt.included.tpd
@@ -1,13 +1,18 @@
-// Target Platform for papyrus RT
-target "Papyrus Release with full Papyrus RT TP" with source requirements
+/**
+ * Full Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the Papyrus-RT features in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases full target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.papyrus/org.eclipse.papyrusrt.targetplatform.papyrus.tpd"
 
-// Includes full Papyrus RT features
-location "http://download.eclipse.org/papyrus-rt/updates/nightly/neon/" eclipse-papyrus-RT-master {
-	org.eclipse.papyrusrt.feature.feature.group lazy
-	org.eclipse.papyrusrt.codegen-feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group lazy
+// Includes all Papyrus-RT features
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.feature.feature.group
+	org.eclipse.papyrusrt.codegen-feature.feature.group
+	org.eclipse.papyrusrt.rts-feature.feature.group
+	org.eclipse.papyrusrt.umlrt.migration.rsa.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.tooling.compare.feature.feature.group
 }
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
index df3cbb9..e97ff3d 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/eclipse/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Tooling" sequenceNumber="1498742177">
+<target name="Papyrus-RT releases tooling target platform" sequenceNumber="1500403702">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,25 +26,20 @@
       <repository location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.1.0.201607121925"/>
-      <repository id="eclipse-elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
-      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Profile/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
+      <repository id="gmf-tooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
@@ -77,11 +50,31 @@
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="file:/home/hudson/genie.papyrus-rt/.hudson/jobs/Papyrus-RT-Master-Core/lastSuccessful/archive/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="file:/home/data/httpd/download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
       <repository id="interoperability" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/egit/updates/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
index 4e627f1..1b10d93 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.target
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Release TP for Tooling" sequenceNumber="1498742177">
+<target name="Papyrus-RT releases tooling target platform" sequenceNumber="1500403702">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170531-1133"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.12.0.v20170519-1412"/>
       <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170605-1616"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170612-1255"/>
       <repository id="eclipse-release" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
-      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
-      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201706140437"/>
-      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201706140437"/>
-      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license/"/>
     </location>
@@ -48,25 +26,20 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
-      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.1.0.201607121925"/>
-      <repository id="eclipse-elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201706140736"/>
       <repository id="papyrus-release" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
-      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+      <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-profile" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Profile/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="1.0.4"/>
+      <repository id="eclipse-papyrus-designer" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/neon/1.0.4_papyrus-designer-neon_494/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling" version="2.1.0.201509291144"/>
+      <repository id="gmf-tooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrusrt.umlrt.core.feature.feature.group" version="0.0.0"/>
@@ -77,11 +50,31 @@
       <unit id="org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group" version="0.0.0"/>
-      <repository id="papyrus-rt-core" location="https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.feature.group" version="1.0.0.201707181432"/>
+      <unit id="org.eclipse.papyrusrt.umlrt.profile.feature.source.feature.group" version="1.0.0.201707181432"/>
+      <repository id="papyrus-rt-last-milestone" location="http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.interoperability.rsa.feature.feature.group" version="1.4.0.201706271239"/>
       <repository id="interoperability" location="http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.cwt" version="1.0.0.201703081533"/>
+      <repository id="nebula-release" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.1.201707041528"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.1.201707041528"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+      <repository location="http://download.eclipse.org/egit/updates/"/>
+    </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
index e904939..e58dc9d 100644
--- a/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
+++ b/org.eclipse.papyrusrt.targetplatform/papyrusrelease/org.eclipse.papyrusrt.targetplatform.tooling/org.eclipse.papyrusrt.targetplatform.tooling.tpd
@@ -1,15 +1,44 @@
-// Target Platform for papyrus RT
-target "Papyrus Release TP for Tooling" with source requirements
+/**
+ * Tooling Target Platform for Papyrus-RT (releases)
+ * 
+ * This TP is intended to contain the dependencies used by the Papyrus-RT tooling component in the releases versions of Papyrus-RT.
+ */
+target "Papyrus-RT releases tooling target platform" with source requirements
 
 include "../org.eclipse.papyrusrt.targetplatform.core/org.eclipse.papyrusrt.targetplatform.core.tpd"
 
-location "https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-Core/lastSuccessfulBuild/artifact/repository/" papyrus-rt-core {
-	org.eclipse.papyrusrt.umlrt.core.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.common.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group lazy
-	org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group lazy
+location "http://download.eclipse.org/papyrus-rt/updates/milestones/oxygen/1.0.0/M201707181334" papyrus-rt-last-milestone {
+	org.eclipse.papyrusrt.umlrt.core.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.common.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.common.ui.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.cpp.feature.feature.group
+	org.eclipse.papyrusrt.umlrt.core.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.common.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.common.ui.feature.source.feature.group
+	org.eclipse.papyrusrt.umlrt.cpp.feature.source.feature.group
 }
+
+// Papyrus Interoperability for RSA Migration
+location "http://download.eclipse.org/modeling/mdt/papyrus/interoperability/rsa/updates/oxygen/1.4.0/" interoperability {
+	org.eclipse.papyrus.interoperability.rsa.feature.feature.group [1.4.0,2.0.0)
+}
+
+location "http://download.eclipse.org/nebula/releases/1.2.0/" nebula-release {
+	org.eclipse.nebula.cwt [1.0.0,2.0.0)
+}
+
+// EMF Compare and EGit, including dependencies
+location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/3.3.1.201707041528/" {
+	org.eclipse.emf.compare.diagram.gmf.feature.group
+	org.eclipse.emf.compare.diagram.papyrus.feature.group
+	org.eclipse.emf.compare.egit.feature.group
+	org.eclipse.emf.compare.feature.group
+	org.eclipse.emf.compare.ide.ui.feature.group
+	org.eclipse.emf.compare.rcp.ui.feature.group
+	org.eclipse.emf.compare.uml2.feature.group
+}
+
+location "http://download.eclipse.org/egit/updates/" {
+	org.eclipse.egit.feature.group
+}
+
diff --git a/pom.xml b/pom.xml
index f0362f6..c3e0fdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 			build configuration, set: eclipse.release={mars|neon|oxygen|etc.} - which 
 			Eclipse and Papyrus platform stream to build on papyrus.kind={papyrusnightly|papyrusmilestone|papyrusrelease} 
 			- which kind of Papyrus build to build on, according to the kind of Papyrus-RT 
-			build target.kind={papyrus|common|core|...|rt.included} - which kind of target 
+			build target.kind={base|papyrus|profile|core|codegen|tooling|releng|rt.included} - which kind of target 
 			platform to use, according to the particular component to be built, whether 
 			it is a Gerrit build, etc. -->
 		<eclipse.release>oxygen</eclipse.release>
@@ -289,6 +289,13 @@
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-help-plugin</artifactId>
+				<configuration>
+					<output>${basedir}/target/active-profiles.txt</output>
+				</configuration>
+			</plugin>
+			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>${java.source}</source>
diff --git a/tests/junit/pom.xml b/tests/junit/pom.xml
index 2774485..b05b973 100644
--- a/tests/junit/pom.xml
+++ b/tests/junit/pom.xml
@@ -11,19 +11,20 @@
 	<artifactId>org.eclipse.papyrusrt.tests</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
+
 	<modules>
 		<module>framework/org.eclipse.papyrusrt.junit</module>
 	</modules>
-	
+
 	<repositories>
 		<repository>
-			<id>papyrus-dev</id> <!-- For Papyrus JUnit Framework. This is not released, so we need to reference the Hudson artifact -->
+			<id>papyrus-dev</id> <!-- For Papyrus JUnit Framework. This is not released, so we need to reference 
+				the Hudson artifact -->
 			<layout>p2</layout>
 			<url>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</url>
 		</repository>
 	</repositories>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -48,52 +49,52 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<profiles>
-	
-	<profile>
-		<id>default</id>
-		<modules>
-			<module>umlrt/profile</module>
-			<module>umlrt/common</module>
-			<module>umlrt/core</module>
-			<module>umlrt/cpp</module>
-			<module>umlrt/tooling</module>
-			<module>umlrt/migration</module>
-			<module>umlrt/codegen</module>
-			<module>xtumlrt/common</module>
-		</modules>
-		<activation>
-			<activeByDefault>true</activeByDefault>
-		</activation>
-	</profile>
-	
-	<profile>
-		<id>core</id>
-		<modules>
-			<module>umlrt/profile</module>
-			<module>umlrt/common</module>
-			<module>umlrt/core</module>
-			<module>umlrt/cpp</module>
-		</modules>
-	</profile>
-	
-	<profile>
-		<id>tooling</id>
-		<modules>
-			<module>umlrt/tooling</module>
-			<module>umlrt/migration</module>
-		</modules>
-	</profile>
-	
-	<profile>
-		<id>codegen</id>
-		<modules>
-			<module>umlrt/codegen</module>
-			<module>xtumlrt/common</module>
-		</modules>
-	</profile> 
-	
+
+		<profile>
+			<id>default</id>
+			<modules>
+				<module>umlrt/profile</module>
+				<module>umlrt/common</module>
+				<module>umlrt/core</module>
+				<module>umlrt/cpp</module>
+				<module>umlrt/tooling</module>
+				<module>umlrt/migration</module>
+				<module>umlrt/codegen</module>
+				<module>xtumlrt/common</module>
+			</modules>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+
+		<profile>
+			<id>core</id>
+			<modules>
+				<module>umlrt/profile</module>
+				<module>umlrt/common</module>
+				<module>umlrt/core</module>
+				<module>umlrt/cpp</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>tooling</id>
+			<modules>
+				<module>umlrt/tooling</module>
+				<module>umlrt/migration</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>codegen</id>
+			<modules>
+				<module>umlrt/codegen</module>
+				<module>xtumlrt/common</module>
+			</modules>
+		</profile>
+
 	</profiles>
-	
+
 </project>