diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.target b/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.target
index 5e6709c..37b3b9b 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.target
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_capella_2019-06" sequenceNumber="1583332252">
+<target name="sirius_capella_2019-06" sequenceNumber="1583855084">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -60,12 +60,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.targetplatform b/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.targetplatform
index 8bad2ce..0b44f4d 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.targetplatform
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2019-06.targetplatform
@@ -6,7 +6,7 @@
 include "../modules/aql-3.7.tpd"
 include "../modules/acceleo-3.7.tpd"
 include "../modules/elk-0.6.tpd"
-include "../modules/gmf-runtime-1.12.tpd"
+include "../modules/gmf-runtime-1.13.tpd"
 
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.target b/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.target
index 70f00be..684968d 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.target
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_capella_2019-12" sequenceNumber="1583332248">
+<target name="sirius_capella_2019-12" sequenceNumber="1583855084">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -63,12 +63,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.targetplatform b/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.targetplatform
index 89c1afe..d30c68a 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.targetplatform
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2019-12.targetplatform
@@ -6,7 +6,7 @@
 include "../modules/aql-3.7.tpd"
 include "../modules/acceleo-nightly.tpd"
 include "../modules/elk-0.6.tpd"
-include "../modules/gmf-runtime-1.12.tpd"
+include "../modules/gmf-runtime-1.13.tpd"
 
 
 with source, requirements
diff --git a/releng/org.eclipse.sirius.targets/modules/gmf-runtime-1.13.tpd b/releng/org.eclipse.sirius.targets/modules/gmf-runtime-1.13.tpd
new file mode 100644
index 0000000..c5e09ae
--- /dev/null
+++ b/releng/org.eclipse.sirius.targets/modules/gmf-runtime-1.13.tpd
@@ -0,0 +1,12 @@
+target "gmf-runtime-1.13"
+
+with source, requirements
+
+location GMF-Notation-1.13.0 "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829" {
+    org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+}
+
+location GMF-Runtime-1.13.0 "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110" {
+    org.eclipse.gmf.runtime.sdk.feature.group lazy
+    org.eclipse.gmf.runtime.thirdparty.feature.group lazy
+}
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-06.target b/releng/org.eclipse.sirius.targets/sirius_2019-06.target
index bac37a7..10c5b67 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-06.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-06.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2019-06" sequenceNumber="1583332248">
+<target name="sirius_2019-06" sequenceNumber="1583855088">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -87,12 +87,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-06.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2019-06.targetplatform
index 13b2a80..015dec3 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-06.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-06.targetplatform
@@ -8,7 +8,7 @@
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.6.tpd"
 include "modules/jetty-9.4.tpd"
-include "modules/gmf-runtime-1.12.tpd"
+include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-09.target b/releng/org.eclipse.sirius.targets/sirius_2019-09.target
index 9439215..09be228 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-09.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-09.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2019-09" sequenceNumber="1583332250">
+<target name="sirius_2019-09" sequenceNumber="1583855089">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -87,12 +87,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-09.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2019-09.targetplatform
index 58c7ea4..3539f9e 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-09.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-09.targetplatform
@@ -8,7 +8,7 @@
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.6.tpd"
 include "modules/jetty-9.4.tpd"
-include "modules/gmf-runtime-1.12.tpd"
+include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-12.target b/releng/org.eclipse.sirius.targets/sirius_2019-12.target
index a3048d5..6262d95 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-12.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-12.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2019-12" sequenceNumber="1583332248">
+<target name="sirius_2019-12" sequenceNumber="1583855090">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -90,12 +90,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2019-12.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2019-12.targetplatform
index 5486dbd..bc4ab8f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2019-12.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2019-12.targetplatform
@@ -8,7 +8,7 @@
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.6.tpd"
 include "modules/jetty-9.4.tpd"
-include "modules/gmf-runtime-1.12.tpd"
+include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-03.target b/releng/org.eclipse.sirius.targets/sirius_2020-03.target
index 585cdda..47c0118 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-03.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-03.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_2020-03" sequenceNumber="1583332272">
+<target name="sirius_2020-03" sequenceNumber="1583855091">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -90,12 +90,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-03.targetplatform b/releng/org.eclipse.sirius.targets/sirius_2020-03.targetplatform
index eb726a8..e0cb657 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-03.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-03.targetplatform
@@ -8,7 +8,7 @@
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.6.tpd"
 include "modules/jetty-9.4.tpd"
-include "modules/gmf-runtime-1.12.tpd"
+include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_photon.target b/releng/org.eclipse.sirius.targets/sirius_photon.target
index f499679..fd9fcf8 100644
--- a/releng/org.eclipse.sirius.targets/sirius_photon.target
+++ b/releng/org.eclipse.sirius.targets/sirius_photon.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="sirius_photon" sequenceNumber="1583332248">
+<target name="sirius_photon" sequenceNumber="1583855092">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -87,12 +87,12 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
+      <repository id="GMF-Notation-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S202003100829"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.12.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
+      <repository id="GMF-Runtime-1.13.0" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202003101110"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
index 7dfa49a..3c61921 100644
--- a/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_photon.targetplatform
@@ -8,7 +8,7 @@
 include "modules/eef-2.1.tpd"
 include "modules/elk-0.6.tpd"
 include "modules/jetty-9.4.tpd"
-include "modules/gmf-runtime-1.12.tpd"
+include "modules/gmf-runtime-1.13.tpd"
 
 with source, requirements