diff --git a/Jenkinsfile b/Jenkinsfile
index 40de6b8a..18980f0f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
 	environment {
 		BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
 		CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
-		CAPELLA_BRANCH = 'master'
+		CAPELLA_BRANCH = '5.x'
   	}
   
   	stages {
diff --git a/features/org.polarsys.capella.vp.requirements.af.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.af.feature/feature.xml
index 4a1ceebd..b130bdbd 100644
--- a/features/org.polarsys.capella.vp.requirements.af.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.af.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.vp.requirements.af.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
@@ -32,7 +32,7 @@
          id="org.polarsys.capella.vp.requirements.af"
          download-size="0"
          install-size="0"
-         version="0.12.2.qualifier"
+         version="0.12.3.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/org.polarsys.capella.vp.requirements.af.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.af.feature/pom.xml
index 6d1dfed0..285e30b0 100644
--- a/features/org.polarsys.capella.vp.requirements.af.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.af.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.cdo.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.cdo.feature/feature.xml
index bdfffcb1..677c9e76 100644
--- a/features/org.polarsys.capella.vp.requirements.cdo.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.cdo.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.vp.requirements.cdo.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/features/org.polarsys.capella.vp.requirements.cdo.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.cdo.feature/pom.xml
index 8f37751a..39a2c1af 100644
--- a/features/org.polarsys.capella.vp.requirements.cdo.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.cdo.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.feature/feature.xml
index b7d128de..51cd51f7 100644
--- a/features/org.polarsys.capella.vp.requirements.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.polarsys.capella.vp.requirements.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.polarsys.capella.vp.requirements.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.feature/pom.xml
index a5cdc770..e109d3f0 100644
--- a/features/org.polarsys.capella.vp.requirements.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.importer.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.importer.feature/feature.xml
index bbddd266..e9d8db26 100644
--- a/features/org.polarsys.capella.vp.requirements.importer.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.importer.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.vp.requirements.importer.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -29,7 +29,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
+      <import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.3.qualifier"/>
    </requires>
 
    <plugin
diff --git a/features/org.polarsys.capella.vp.requirements.importer.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.importer.feature/pom.xml
index be1f18db..2e68330a 100644
--- a/features/org.polarsys.capella.vp.requirements.importer.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.importer.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.representation.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.representation.feature/feature.xml
index dc08cba8..c50ac41c 100644
--- a/features/org.polarsys.capella.vp.requirements.representation.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.representation.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.vp.requirements.representation.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/features/org.polarsys.capella.vp.requirements.representation.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.representation.feature/pom.xml
index 720f4422..81eb26d6 100644
--- a/features/org.polarsys.capella.vp.requirements.representation.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.representation.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.tests.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.tests.feature/feature.xml
index 9f3380a3..8c2fd206 100644
--- a/features/org.polarsys.capella.vp.requirements.tests.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.tests.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.polarsys.capella.vp.requirements.tests.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/features/org.polarsys.capella.vp.requirements.tests.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.tests.feature/pom.xml
index b18fc417..4ae88d6c 100644
--- a/features/org.polarsys.capella.vp.requirements.tests.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.tests.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2019, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.thirdparty.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.thirdparty.feature/feature.xml
index ac416b55..4ea02b7c 100644
--- a/features/org.polarsys.capella.vp.requirements.thirdparty.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.thirdparty.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.vp.requirements.thirdparty.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.polarsys.capella.vp.requirements.thirdparty.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.thirdparty.feature/pom.xml
index ddb3d444..5ce2775a 100644
--- a/features/org.polarsys.capella.vp.requirements.thirdparty.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.thirdparty.feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.capella.vp.requirements.ui.feature/feature.xml b/features/org.polarsys.capella.vp.requirements.ui.feature/feature.xml
index ac6a7a79..2a3369ea 100644
--- a/features/org.polarsys.capella.vp.requirements.ui.feature/feature.xml
+++ b/features/org.polarsys.capella.vp.requirements.ui.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.polarsys.capella.vp.requirements.ui.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -29,7 +29,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.2.qualifier"/>
+      <import feature="org.polarsys.capella.vp.requirements.thirdparty.feature" version="0.12.3.qualifier"/>
    </requires>
 
    <plugin
diff --git a/features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml b/features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml
index a8ed47cc..47ac10d9 100644
--- a/features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml
+++ b/features/org.polarsys.capella.vp.requirements.ui.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.kitalpha.vp.requirements.af.feature/feature.xml b/features/org.polarsys.kitalpha.vp.requirements.af.feature/feature.xml
index 7c62703c..d9f3bd50 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.af.feature/feature.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.af.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.kitalpha.vp.requirements.af.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
@@ -32,7 +32,7 @@
          id="org.polarsys.kitalpha.vp.requirements.af"
          download-size="0"
          install-size="0"
-         version="0.12.2.qualifier"
+         version="0.12.3.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/org.polarsys.kitalpha.vp.requirements.af.feature/pom.xml b/features/org.polarsys.kitalpha.vp.requirements.af.feature/pom.xml
index 696440fc..517a3063 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.af.feature/pom.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.af.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/feature.xml b/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/feature.xml
index d7686d3e..0d81b1bc 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/feature.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.polarsys.kitalpha.vp.requirements.docgen.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/pom.xml b/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/pom.xml
index 3aa69e16..ce0c7641 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/pom.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.docgen.feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.kitalpha.vp.requirements.feature/feature.xml b/features/org.polarsys.kitalpha.vp.requirements.feature/feature.xml
index 5c7edd45..a1c55255 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.feature/feature.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2017, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2017, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.kitalpha.vp.requirements.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.polarsys.kitalpha.vp.requirements.feature/pom.xml b/features/org.polarsys.kitalpha.vp.requirements.feature/pom.xml
index 10af8e3a..97176ffe 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.feature/pom.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.kitalpha.vp.requirements.representation.feature/feature.xml b/features/org.polarsys.kitalpha.vp.requirements.representation.feature/feature.xml
index be5404a3..af3c6e6f 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.representation.feature/feature.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.representation.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.kitalpha.vp.requirements.representation.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
diff --git a/features/org.polarsys.kitalpha.vp.requirements.representation.feature/pom.xml b/features/org.polarsys.kitalpha.vp.requirements.representation.feature/pom.xml
index 0aa7982d..ba5fbb31 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.representation.feature/pom.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.representation.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/features/org.polarsys.kitalpha.vp.requirements.ui.feature/feature.xml b/features/org.polarsys.kitalpha.vp.requirements.ui.feature/feature.xml
index b821da67..6023089f 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.ui.feature/feature.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.ui.feature/feature.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
+  SPDX-License-Identifier: EPL-2.0
+
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.kitalpha.vp.requirements.ui.feature"
       label="%featureName"
-      version="0.12.2.qualifier"
+      version="0.12.3.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
diff --git a/features/org.polarsys.kitalpha.vp.requirements.ui.feature/pom.xml b/features/org.polarsys.kitalpha.vp.requirements.ui.feature/pom.xml
index d5dd54de..9a2a25e2 100644
--- a/features/org.polarsys.kitalpha.vp.requirements.ui.feature/pom.xml
+++ b/features/org.polarsys.kitalpha.vp.requirements.ui.feature/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.polarsys</groupId>
     <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-    <version>0.12.2-SNAPSHOT</version>
+    <version>0.12.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/plugins/org.polarsys.capella.vp.requirements.af/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.af/META-INF/MANIFEST.MF
index bb9e0d78..1e6d0b57 100644
--- a/plugins/org.polarsys.capella.vp.requirements.af/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.af/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.af;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.viewpoint.ui,
  org.polarsys.capella.vp.requirements,
diff --git a/plugins/org.polarsys.capella.vp.requirements.af/model/CapellaRequirements.vp b/plugins/org.polarsys.capella.vp.requirements.af/model/CapellaRequirements.vp
index 26c0945d..36a66f99 100644
--- a/plugins/org.polarsys.capella.vp.requirements.af/model/CapellaRequirements.vp
+++ b/plugins/org.polarsys.capella.vp.requirements.af/model/CapellaRequirements.vp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Capella Requirements" id="org.polarsys.capella.vp.requirements" vpid="_MB6moB21EeaZT-H7SsDebw" version="0.12.2">
+<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Capella Requirements" id="org.polarsys.capella.vp.requirements" vpid="_MB6moB21EeaZT-H7SsDebw" version="0.12.3">
   <ruleSet vpid="_oNyM8VQPEeas5ZJk-jBSMA" target="_MB6moB21EeaZT-H7SsDebw"/>
   <serviceSet vpid="_oNyM8FQPEeas5ZJk-jBSMA" target="_MB6moB21EeaZT-H7SsDebw"/>
   <dependencies href="../../org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp#_SyafgB20EeaZT-H7SsDebw"/>
diff --git a/plugins/org.polarsys.capella.vp.requirements.business.queries/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.business.queries/META-INF/MANIFEST.MF
index d69db419..27611694 100644
--- a/plugins/org.polarsys.capella.vp.requirements.business.queries/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.business.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.business.queries;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.services,
  org.polarsys.capella.core.data.business.queries,
diff --git a/plugins/org.polarsys.capella.vp.requirements.design/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.design/META-INF/MANIFEST.MF
index e0b82bbd..a54fc12b 100644
--- a/plugins/org.polarsys.capella.vp.requirements.design/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.design;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Activator: org.polarsys.capella.vp.requirements.design.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.capella.vp.requirements.design/src/org/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java b/plugins/org.polarsys.capella.vp.requirements.design/src/org/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java
index 6d0c0a0f..84645281 100644
--- a/plugins/org.polarsys.capella.vp.requirements.design/src/org/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java
+++ b/plugins/org.polarsys.capella.vp.requirements.design/src/org/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java
@@ -387,8 +387,7 @@ protected String evaluateExpression(Session session, Requirement requirement, St
             resultBuilder.append(value);
           }
           String evaluationResult = resultBuilder.toString();
-          String sanytizedResult = LabelHelper.transformHTMLToTextWithLineFeed(evaluationResult);
-
+          String sanytizedResult = LabelHelper.unescape(LabelHelper.transformHTMLToText(evaluationResult));
           return reduceString(sanytizedResult, maxLength);
         }
       }
diff --git a/plugins/org.polarsys.capella.vp.requirements.doc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.doc/META-INF/MANIFEST.MF
index 4e233d4d..20eaa13c 100644
--- a/plugins/org.polarsys.capella.vp.requirements.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.doc;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.vp.requirements.fc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.fc/META-INF/MANIFEST.MF
index 086793fa..b790f636 100644
--- a/plugins/org.polarsys.capella.vp.requirements.fc/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.fc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.fc;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.vp.requirements.gen.cdo/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.gen.cdo/META-INF/MANIFEST.MF
index 94e53870..600fd5e8 100644
--- a/plugins/org.polarsys.capella.vp.requirements.gen.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.gen.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Generation Plugin
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.gen.cdo;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf/META-INF/MANIFEST.MF
index 3bdd2513..c9afdc5b 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.attributes.doors.rmf;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.capella.vp.requirements.importer.extension
 Bundle-Vendor: %providerName
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer.commandline/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.importer.commandline/META-INF/MANIFEST.MF
index 4547055d..2b5b7818 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer.commandline/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.importer.commandline/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.commandline;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.core.commandline.core,
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer.extension/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.importer.extension/META-INF/MANIFEST.MF
index 65e20acf..25ece59c 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer.extension/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.importer.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.extension;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.emf.common,
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer.preferences/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.importer.preferences/META-INF/MANIFEST.MF
index b420c261..7d25cb17 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer.preferences/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.importer.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer.preferences;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.importer/META-INF/MANIFEST.MF
index 07ff59a2..95dd1201 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.importer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Activator: org.polarsys.capella.vp.requirements.importer.RequirementsVPPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.diffmerge.bridge;visibility:=reexport,
diff --git a/plugins/org.polarsys.capella.vp.requirements.importer/src/org/polarsys/capella/vp/requirements/importer/transposer/bridge/ReqIFMapping.java b/plugins/org.polarsys.capella.vp.requirements.importer/src/org/polarsys/capella/vp/requirements/importer/transposer/bridge/ReqIFMapping.java
index 435c7ae2..82e58d4a 100644
--- a/plugins/org.polarsys.capella.vp.requirements.importer/src/org/polarsys/capella/vp/requirements/importer/transposer/bridge/ReqIFMapping.java
+++ b/plugins/org.polarsys.capella.vp.requirements.importer/src/org/polarsys/capella/vp/requirements/importer/transposer/bridge/ReqIFMapping.java
@@ -435,7 +435,7 @@ protected String getContent(AttributeValueXHTML value, AttributeOwner owner) {
       // We've got to store root tag here since ReqIF10XhtmlUtil.getXhtmlString does not include the original root tag of the XHTML element
       rootTag = getRootTag(theValue);
       content = ReqIF10XhtmlUtil.getXhtmlString(theValue);
-      if (value.getDefinition().getLongName().equals("ReqIF.Text")) {
+      if (LabelHelper.keepHtmlTags() || value.getDefinition().getLongName().equals("ReqIF.Text")) {
         content = textParser.transformToHTML(content, owner, rootTag);
       } else {
         content = transformToText(content, rootTag);
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.cdo/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.model.cdo/META-INF/MANIFEST.MF
index 59275f79..cea362fd 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.model.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.model.cdo;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.cdo/pom.xml b/plugins/org.polarsys.capella.vp.requirements.model.cdo/pom.xml
index fb6197e4..c9b2b2d7 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.cdo/pom.xml
+++ b/plugins/org.polarsys.capella.vp.requirements.model.cdo/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.vp.requirements.model.cdo</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
index b8277abc..9b1fd9d6 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.model.edit.decorators;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.capella.vp.requirements.model.edit,
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.edit/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.model.edit/META-INF/MANIFEST.MF
index 03e1190a..cee1d336 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.model.edit;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.capella.vp.requirements.CapellaRequirements.provider.CapellaRequirementsEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.edit/pom.xml b/plugins/org.polarsys.capella.vp.requirements.model.edit/pom.xml
index 089e2aaf..a4fa8de5 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.edit/pom.xml
+++ b/plugins/org.polarsys.capella.vp.requirements.model.edit/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.vp.requirements.model.edit</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.capella.vp.requirements.model.helpers/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.model.helpers/META-INF/MANIFEST.MF
index 18fb19e3..1dc02a6f 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model.helpers/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.model.helpers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.model.helpers;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.vp.requirements.model/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.model/META-INF/MANIFEST.MF
index b524ad21..436af446 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.model;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.vp.requirements.model/pom.xml b/plugins/org.polarsys.capella.vp.requirements.model/pom.xml
index f999494a..f3e8410e 100644
--- a/plugins/org.polarsys.capella.vp.requirements.model/pom.xml
+++ b/plugins/org.polarsys.capella.vp.requirements.model/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.vp.requirements.model</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.capella.vp.requirements.quickfix/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.quickfix/META-INF/MANIFEST.MF
index b6861a98..c7b17164 100644
--- a/plugins/org.polarsys.capella.vp.requirements.quickfix/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.quickfix/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.quickfix;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.capella.vp.requirements.reqif.resource.obfuscator/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.reqif.resource.obfuscator/META-INF/MANIFEST.MF
index 106d3ef7..413e0fb9 100644
--- a/plugins/org.polarsys.capella.vp.requirements.reqif.resource.obfuscator/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.reqif.resource.obfuscator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.reqif.resource.obfuscator;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.polarsys.capella.vp.requirements.semantic.browser/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.semantic.browser/META-INF/MANIFEST.MF
index cb0aec24..c7c3f47b 100644
--- a/plugins/org.polarsys.capella.vp.requirements.semantic.browser/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.semantic.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.semantic.browser;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.ecore,
  org.polarsys.capella.common.ui.toolkit.browser,
diff --git a/plugins/org.polarsys.capella.vp.requirements.ui.commands/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.ui.commands/META-INF/MANIFEST.MF
index 50082fc7..c0cdbe6c 100644
--- a/plugins/org.polarsys.capella.vp.requirements.ui.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.ui.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ui.commands;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Activator: org.polarsys.capella.vp.requirements.ui.commands.RequirementsVPUICommandsPlugin
 Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.core.resources,
diff --git a/plugins/org.polarsys.capella.vp.requirements.ui.importer.preferences/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.ui.importer.preferences/META-INF/MANIFEST.MF
index 851534c7..b90138c4 100644
--- a/plugins/org.polarsys.capella.vp.requirements.ui.importer.preferences/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.ui.importer.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ui.importer.preferences;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
diff --git a/plugins/org.polarsys.capella.vp.requirements.ui.properties/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.ui.properties/META-INF/MANIFEST.MF
index 8e158105..92c233df 100644
--- a/plugins/org.polarsys.capella.vp.requirements.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.ui.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ui.properties;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.services,
  org.polarsys.capella.core.ui.properties,
diff --git a/plugins/org.polarsys.capella.vp.requirements.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.ui/META-INF/MANIFEST.MF
index acfcf541..57404dc3 100644
--- a/plugins/org.polarsys.capella.vp.requirements.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.ui/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.polarsys.capella.vp.requirements.model,
- org.polarsys.kitalpha.ad.services,
- org.polarsys.capella.core.ui.semantic.browser,
- org.polarsys.capella.vp.requirements.semantic.browser,
- org.polarsys.capella.common.ui.massactions,
- org.polarsys.capella.common.ui.massactions.core,
- org.polarsys.kitalpha.massactions,
- org.polarsys.kitalpha.massactions.core,
- org.polarsys.capella.vp.requirements.model.helpers
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.polarsys.capella.vp.requirements.ui.massactions,
- org.polarsys.capella.vp.requirements.ui.semanticbrowser.actions
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ui;singleton:=true
+Bundle-Version: 0.12.3.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.polarsys.capella.vp.requirements.model,
+ org.polarsys.kitalpha.ad.services,
+ org.polarsys.capella.core.ui.semantic.browser,
+ org.polarsys.capella.vp.requirements.semantic.browser,
+ org.polarsys.capella.common.ui.massactions,
+ org.polarsys.capella.common.ui.massactions.core,
+ org.polarsys.kitalpha.massactions,
+ org.polarsys.kitalpha.massactions.core,
+ org.polarsys.capella.vp.requirements.model.helpers
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.polarsys.capella.vp.requirements.ui.massactions,
+ org.polarsys.capella.vp.requirements.ui.semanticbrowser.actions
diff --git a/plugins/org.polarsys.capella.vp.requirements.validation/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.validation/META-INF/MANIFEST.MF
index 70923641..cacaf8e0 100644
--- a/plugins/org.polarsys.capella.vp.requirements.validation/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.validation;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.services,
  org.polarsys.capella.core.ui.properties,
diff --git a/plugins/org.polarsys.capella.vp.requirements.vpdsl/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements.vpdsl/META-INF/MANIFEST.MF
index d0cddc5f..b5cf8501 100644
--- a/plugins/org.polarsys.capella.vp.requirements.vpdsl/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements.vpdsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.vpdsl;singleton:=true
 Bundle-Name: %Bundle-Name 
 Bundle-Vendor: %Bundle-Vendor 
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.resourcereuse,
diff --git a/plugins/org.polarsys.capella.vp.requirements/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.requirements/META-INF/MANIFEST.MF
index e63b10da..0a45a411 100644
--- a/plugins/org.polarsys.capella.vp.requirements/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.vp.requirements/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.af/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.af/META-INF/MANIFEST.MF
index 1cf9484f..739fb104 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.af/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.af/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.af;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.viewpoint.ui,
  org.polarsys.kitalpha.vp.requirements,
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp b/plugins/org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp
index 93de88f4..b7abf2d3 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.af/model/Requirements.vp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Requirements" id="org.polarsys.kitalpha.vp.requirements" vpid="_SyafgB20EeaZT-H7SsDebw" version="0.12.2">
+<vp:Viewpoint xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sirius="http://www.polarsys.org/kitalpha/ad/sirius/1.0.0" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0" name="Requirements" id="org.polarsys.kitalpha.vp.requirements" vpid="_SyafgB20EeaZT-H7SsDebw" version="0.12.3">
   <ruleSet vpid="_6KrTYPI0EeeF8ooAqnhiog" target="_SyafgB20EeaZT-H7SsDebw"/>
   <serviceSet vpid="_6KqsUPI0EeeF8ooAqnhiog" target="_SyafgB20EeaZT-H7SsDebw"/>
   <metamodel>
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.design/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.design/META-INF/MANIFEST.MF
index 30808aa8..39e2ca42 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.design/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.design;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Activator: org.polarsys.kitalpha.vp.requirements.design.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.docgen/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.docgen/META-INF/MANIFEST.MF
index 2f5f12f5..9a39cef3 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.docgen/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.docgen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.docgen;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.docgen/pom.xml b/plugins/org.polarsys.kitalpha.vp.requirements.docgen/pom.xml
index d9d78776..8466ef3a 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.docgen/pom.xml
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.docgen/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.kitalpha.vp.requirements.docgen</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.fc/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.fc/META-INF/MANIFEST.MF
index f8e5987d..c944f139 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.fc/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.fc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.fc;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/META-INF/MANIFEST.MF
index fbfe0135..ef87a4d0 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.model.cdo;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/pom.xml b/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/pom.xml
index 003a8385..39993dcd 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/pom.xml
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.cdo/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.kitalpha.vp.requirements.model.cdo</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
index 02148504..05ee382f 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.model.edit.decorators;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.sirius,
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/RequirementItemProviderDecorator.java b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/RequirementItemProviderDecorator.java
index 6bf80695..9d6ec8b6 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/RequirementItemProviderDecorator.java
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/RequirementItemProviderDecorator.java
@@ -90,7 +90,7 @@ public String getText(Object object) {
         } else {
           result += value;
         }
-        result = LabelHelper.transformHTMLToText(result);
+        result = LabelHelper.unescape(LabelHelper.transformHTMLToText(result));
         return reduceReqNameLen(result, RequirementsPreferencesPlugin.getDefault().getPreferenceStore()
             .getString(RequirementsPreferencesConstants.REQUIREMENT_LABEL_MAX_LEN_KEY));
       }
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/StringValueAttributeItemProviderDecorator.java b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/StringValueAttributeItemProviderDecorator.java
index da66a534..da0aac2e 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/StringValueAttributeItemProviderDecorator.java
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit.decorators/src/org/polarsys/kitalpha/vp/requirements/Requirements/provider/StringValueAttributeItemProviderDecorator.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 THALES GLOBAL SERVICES.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- * 
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ * 
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -23,6 +23,7 @@
 import org.polarsys.kitalpha.vp.requirements.Requirements.AttributeDefinition;
 import org.polarsys.kitalpha.vp.requirements.Requirements.StringValueAttribute;
 import org.polarsys.kitalpha.vp.requirements.model.edit.decorators.ItemProviderAdapterDecorator;
+import org.polarsys.kitalpha.vp.requirements.model.helpers.LabelHelper;
 
 /**
  * @author Joao Barata
@@ -49,8 +50,7 @@ public String getText(Object object) {
     }
     
     result.append(" ");
-    result.append(attribute.getValue());
-    
+    result.append(LabelHelper.unescape(attribute.getValue()));
     return result.toString();
   }
 }
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/META-INF/MANIFEST.MF
index 7e671ea8..08412a2d 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.model.edit;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.kitalpha.vp.requirements.Requirements.provider.RequirementsEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/pom.xml b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/pom.xml
index b1de49c0..d777a3e2 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/pom.xml
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.edit/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.kitalpha.vp.requirements.model.edit</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/META-INF/MANIFEST.MF
index b71866c8..27de3b75 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.model.helpers;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java b/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java
index 7f43309d..b6daa963 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java
@@ -21,12 +21,21 @@ public class LabelHelper {
   private LabelHelper() {
     // Private constructor
   }
+
+  public static String unescape(String content) {
+    return StringEscapeUtils.unescapeHtml(content);
+  }
+
+  public static String toOneLine(String content) {
+    return content.replace("\r\n", " ").replace("\n", " ").trim();
+  }
+	  
   public static String transformHTMLToText(String content) {
-    return transformHTMLToTextWithLineFeed(content).replace("\r\n", " ").replace("\n", " ").trim();
+    return toOneLine(transformHTMLToTextWithLineFeed(content));
   }
   
   public static String transformHTMLToText(String content, String rootTag) {
-    String result = transformHTMLToTextWithLineFeed(content).replace("\r\n", " ").replace("\n", " ").trim();
+    String result = toOneLine(transformHTMLToTextWithLineFeed(content));
     if (rootTag != null && keepHtmlTags()) {
       return "<" + rootTag + ">" + result + "</" + rootTag + ">";
     }
@@ -36,13 +45,13 @@ public static String transformHTMLToText(String content, String rootTag) {
   public static String transformHTMLToTextWithLineFeed(String content) {
     if (!keepHtmlTags()) {
       content = content.replaceAll("<xhtml:br/>", " ").replaceAll("<[^>]*>", "").trim();
+//      // Decode special characters
+      content = URI.decode(content);
+//      // Unescape HTML special character entities
+      content = unescape(content);
     } else {
       content = content.replaceAll("(?!</xhtml)(?!<xhtml)<[^>]*>", "").replace("xhtml:", "");
     }
-    // Decode special characters
-    content = URI.decode(content);
-    // Unescape HTML special character entities
-    content = StringEscapeUtils.unescapeHtml(content);
     return content;
   }
   
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.model/META-INF/MANIFEST.MF
index 99f5a064..fea9d7e2 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.model;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.model/pom.xml b/plugins/org.polarsys.kitalpha.vp.requirements.model/pom.xml
index 3a432ccd..1b99d2ba 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.model/pom.xml
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.model/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
@@ -28,7 +28,7 @@
 	
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.kitalpha.vp.requirements.model</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 </project>
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.ui.properties/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.ui.properties/META-INF/MANIFEST.MF
index bf63befe..baee9292 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.ui.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.ui.properties;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.ad.services,
  org.polarsys.capella.core.ui.properties,
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.ui/META-INF/MANIFEST.MF
index b2d909ff..632ebc0e 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.vp.requirements.model,
  org.polarsys.kitalpha.ad.services
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements.vpdsl/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements.vpdsl/META-INF/MANIFEST.MF
index a8628107..29d37e42 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements.vpdsl/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements.vpdsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements.vpdsl;singleton:=true
 Bundle-Name: %Bundle-Name 
 Bundle-Vendor: %Bundle-Vendor 
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.kitalpha.resourcereuse
diff --git a/plugins/org.polarsys.kitalpha.vp.requirements/META-INF/MANIFEST.MF b/plugins/org.polarsys.kitalpha.vp.requirements/META-INF/MANIFEST.MF
index 6a3a7824..91a8f9db 100644
--- a/plugins/org.polarsys.kitalpha.vp.requirements/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.kitalpha.vp.requirements/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.vp.requirements;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5f2c3da4..09021db3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.polarsys</groupId>
diff --git a/pom.xml b/pom.xml
index 2f1493f5..89596731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <name>Capella Requirements Viewpoint</name>
   <groupId>org.polarsys</groupId>
   <artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-  <version>0.12.2-SNAPSHOT</version>
+  <version>0.12.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -111,7 +111,7 @@
 				<artifact>
 					<groupId>org.polarsys</groupId>
 					<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-					<version>0.12.2-SNAPSHOT</version>
+					<version>0.12.3-SNAPSHOT</version>
 					<classifier>releng/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition</classifier>
 				</artifact>
 			</target>
diff --git a/releng/org.polarsys.capella.vp.requirements.site/category.xml b/releng/org.polarsys.capella.vp.requirements.site/category.xml
index 571b7841..b8491697 100644
--- a/releng/org.polarsys.capella.vp.requirements.site/category.xml
+++ b/releng/org.polarsys.capella.vp.requirements.site/category.xml
@@ -3,16 +3,16 @@
    <description url="http://www.polarsys.org/capella">
       Capella Requirements Viewpoint
    </description>
-   <feature id="org.polarsys.capella.vp.requirements.feature.source" version="0.12.2.qualifier">
+   <feature id="org.polarsys.capella.vp.requirements.feature.source" version="0.12.3.qualifier">
       <category name="org.polarsys.capella.vp.requirements"/>
    </feature>
-   <feature id="org.polarsys.capella.vp.requirements.cdo.feature.source" version="0.12.2.qualifier">
+   <feature id="org.polarsys.capella.vp.requirements.cdo.feature.source" version="0.12.3.qualifier">
       <category name="org.polarsys.capella.vp.requirements.collaboration"/>
    </feature>
-   <feature url="features/org.polarsys.kitalpha.vp.requirements.docgen.feature" id="org.polarsys.kitalpha.vp.requirements.docgen.feature" version="0.12.2.qualifier">
+   <feature url="features/org.polarsys.kitalpha.vp.requirements.docgen.feature" id="org.polarsys.kitalpha.vp.requirements.docgen.feature" version="0.12.3.qualifier">
       <category name="org.polarsys.capella.vp.requirements.docgen"/>
    </feature>
-   <feature id="org.polarsys.capella.vp.requirements.tests.feature" version="0.12.2.qualifier">
+   <feature id="org.polarsys.capella.vp.requirements.tests.feature" version="0.12.3.qualifier">
       <category name="org.polarsys.capella.vp.requirements.tests"/>
    </feature>
    <category-def name="org.polarsys.capella.vp.requirements" label="Capella Requirements Viewpoint"/>
diff --git a/releng/org.polarsys.capella.vp.requirements.site/pom.xml b/releng/org.polarsys.capella.vp.requirements.site/pom.xml
index 062bb9c9..5101efc0 100644
--- a/releng/org.polarsys.capella.vp.requirements.site/pom.xml
+++ b/releng/org.polarsys.capella.vp.requirements.site/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
 	<artifactId>org.polarsys.capella.vp.requirements.site</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/releng/org.polarsys.capella.vp.requirements.target/pom.xml b/releng/org.polarsys.capella.vp.requirements.target/pom.xml
index 2fa03dc9..18ad8463 100644
--- a/releng/org.polarsys.capella.vp.requirements.target/pom.xml
+++ b/releng/org.polarsys.capella.vp.requirements.target/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2018, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -16,7 +16,7 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>capella.target-definition</artifactId>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<licenses>
diff --git a/releng/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform b/releng/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform
index 12d66737..1d2f7313 100644
--- a/releng/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform
+++ b/releng/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform
@@ -10,16 +10,16 @@
  *******************************************************************************/
 target "CapellaRequirementsVP"
 
-include "https://raw.githubusercontent.com/eclipse/capella/master/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform"
+include "https://download.eclipse.org/capella/core/updates/nightly/5.x/targets/capella.target-definition.targetplatform"
 
 with source, requirements
 
-location "https://download.eclipse.org/capella/core/updates/nightly/master/org.polarsys.capella.rcp.site" {
+location "https://download.eclipse.org/capella/core/updates/releases/5.2.0-R20211130-125709/org.polarsys.capella.rcp.site" {
 	org.polarsys.capella.rcp.feature.group
 	org.polarsys.capella.cdo.mock.feature.feature.group
 }
 
-location "https://download.eclipse.org/capella/core/updates/nightly/master/org.polarsys.capella.test.site" {
+location "https://download.eclipse.org/capella/core/updates/releases/5.2.0-R20211130-125709/org.polarsys.capella.test.site" {
 	org.polarsys.capella.test.feature.feature.group
 }
 
@@ -39,10 +39,10 @@ location "https://download.eclipse.org/modeling/emf/cdo/drops/R20180613-0111/" {
     org.eclipse.emf.cdo.sdk.feature.group
 }
 
-location kitalpha "https://download.eclipse.org/kitalpha/updates/nightly/runtime/master" {
+location kitalpha-runtime-core-master "https://download.eclipse.org/kitalpha/updates/release/runtime/5.2.0/" {
     org.polarsys.kitalpha.doc.gen.business.core.feature.feature.group
 }
 
-location xhtml "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/nightly/master" {
+location xhtml "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/stable/5.1.0-S202106151504/" {
     org.polarsys.capella.docgen.feature.feature.group
 }
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/META-INF/MANIFEST.MF b/tests/org.polarsys.capella.vp.requirements.ju/META-INF/MANIFEST.MF
index 775af4df..5aa19a64 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/META-INF/MANIFEST.MF
+++ b/tests/org.polarsys.capella.vp.requirements.ju/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.vp.requirements.ju;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.12.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.polarsys.capella.test.framework,
  org.polarsys.capella.vp.requirements.af,
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/In-Flight Entertainment System With Requirements/In-Flight Entertainment System.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/In-Flight Entertainment System With Requirements/In-Flight Entertainment System.afm
index cd0d6972..26d877ba 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/In-Flight Entertainment System With Requirements/In-Flight Entertainment System.afm	
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/In-Flight Entertainment System With Requirements/In-Flight Entertainment System.afm	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_2uVOAHjqEea__MYrXGSERA">
   <viewpointReferences id="_dhQ1sIoOEeaQmcRqIfTB6w" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_Jxp_MHq0EeiC94JwciofZw" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_Jzcu8Hq0EeiC94JwciofZw" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_Jxp_MHq0EeiC94JwciofZw" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_Jzcu8Hq0EeiC94JwciofZw" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/MultipleImports/MultipleImports.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/MultipleImports/MultipleImports.afm
index 39b3fbb8..fe7beb37 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/MultipleImports/MultipleImports.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/MultipleImports/MultipleImports.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_3k4V0JeGEeaNgaokOK3kbg">
   <viewpointReferences id="_3l30UJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/attributes/attributes.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/attributes/attributes.afm
index 8f0f5557..c96d530e 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/attributes/attributes.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/attributes/attributes.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_VJJGIIeVEemyF948XbN2DA">
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_VJJGIIeVEemyF948XbN2DA">
   <viewpointReferences id="_VLq1sIeVEemyF948XbN2DA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_WYRywIeVEemyF948XbN2DA" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_WahOcIeVEemyF948XbN2DA" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_WYRywIeVEemyF948XbN2DA" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_WahOcIeVEemyF948XbN2DA" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/bqlibrary/bqlibrary.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/bqlibrary/bqlibrary.afm
index e0d1e3f6..b7c79530 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/bqlibrary/bqlibrary.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/bqlibrary/bqlibrary.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Vxjf0OPmEeaph7HfyRAQFQ">
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Vxjf0OPmEeaph7HfyRAQFQ">
   <viewpointReferences id="_VycQoOPmEeaph7HfyRAQFQ" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_W-E9UOPmEeaph7HfyRAQFQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_XA19cOPmEeaph7HfyRAQFQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_W-E9UOPmEeaph7HfyRAQFQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_XA19cOPmEeaph7HfyRAQFQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/bqmodel/bqmodel.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/bqmodel/bqmodel.afm
index 18739513..4c6e7a88 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/bqmodel/bqmodel.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/bqmodel/bqmodel.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_42_IkOPSEeaYo6G2qc7JWw">
   <viewpointReferences id="_5KAyQOPSEeaYo6G2qc7JWw" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_iam6wOPVEeaph7HfyRAQFQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_ib4tIOPVEeaph7HfyRAQFQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_iam6wOPVEeaph7HfyRAQFQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_ib4tIOPVEeaph7HfyRAQFQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodel/emptymodel.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodel/emptymodel.afm
index 39b3fbb8..fe7beb37 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodel/emptymodel.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodel/emptymodel.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_3k4V0JeGEeaNgaokOK3kbg">
   <viewpointReferences id="_3l30UJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodelWithImportedReqif/emptymodelWithImportedReqif.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodelWithImportedReqif/emptymodelWithImportedReqif.afm
index 39b3fbb8..fe7beb37 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodelWithImportedReqif/emptymodelWithImportedReqif.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/emptymodelWithImportedReqif/emptymodelWithImportedReqif.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_3k4V0JeGEeaNgaokOK3kbg">
   <viewpointReferences id="_3l30UJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/fragmentedModel/emptymodel.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/fragmentedModel/emptymodel.afm
index 39b3fbb8..fe7beb37 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/fragmentedModel/emptymodel.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/fragmentedModel/emptymodel.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_3k4V0JeGEeaNgaokOK3kbg">
   <viewpointReferences id="_3l30UJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_5oYeoJeGEeaNgaokOK3kbg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_5pn0wJeGEeaNgaokOK3kbg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/migration-model/migration-model.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/migration-model/migration-model.afm
index 743102b4..61ce7400 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/migration-model/migration-model.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/migration-model/migration-model.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Pvcb4BkdEeuAR95csvnNoQ">
   <viewpointReferences id="_Pv5H0BkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.core.viewpoint" version="5.1.0"/>
-  <viewpointReferences id="_cVevUBkdEeuAR95csvnNoQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_cXQ4ABkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_cVevUBkdEeuAR95csvnNoQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_cXQ4ABkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/misc/misc.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/misc/misc.afm
index ec57e712..01bd3b8c 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/misc/misc.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/misc/misc.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_2ayEYMX5EeedY4_VcLsGJA">
   <viewpointReferences id="_3NxAgMX5EeedY4_VcLsGJA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_-IjoYMX5EeedY4_VcLsGJA" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_-K2HYMX5EeedY4_VcLsGJA" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_-IjoYMX5EeedY4_VcLsGJA" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_-K2HYMX5EeedY4_VcLsGJA" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/model-with-manually-created-elements/model-with-manually-created-elements.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/model-with-manually-created-elements/model-with-manually-created-elements.afm
index 167a01fd..75dc5e05 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/model-with-manually-created-elements/model-with-manually-created-elements.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/model-with-manually-created-elements/model-with-manually-created-elements.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Pvcb4BkdEeuAR95csvnNoQ">
   <viewpointReferences id="_Pv5H0BkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_cVevUBkdEeuAR95csvnNoQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_cXQ4ABkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_cVevUBkdEeuAR95csvnNoQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_cXQ4ABkdEeuAR95csvnNoQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/sample3/sample3.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/sample3/sample3.afm
index bc4a7fb1..aa043568 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/sample3/sample3.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/sample3/sample3.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_dpTkYPVEEeeiKJbRhouIkg">
   <viewpointReferences id="_dpkqIPVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_uLC4YPVEEeeiKJbRhouIkg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_uL50APVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_uLC4YPVEEeeiKJbRhouIkg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_uL50APVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/sample3WithImportedReqif/sample3WithImportedReqif.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/sample3WithImportedReqif/sample3WithImportedReqif.afm
index bc4a7fb1..aa043568 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/sample3WithImportedReqif/sample3WithImportedReqif.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/sample3WithImportedReqif/sample3WithImportedReqif.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_dpTkYPVEEeeiKJbRhouIkg">
   <viewpointReferences id="_dpkqIPVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_uLC4YPVEEeeiKJbRhouIkg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_uL50APVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_uLC4YPVEEeeiKJbRhouIkg" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_uL50APVEEeeiKJbRhouIkg" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/testmodel/testmodel.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/testmodel/testmodel.afm
index 6e965f7b..e5f840ed 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/testmodel/testmodel.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/testmodel/testmodel.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_tCmHYIuUEeaAJZW24bso0w">
   <viewpointReferences id="_tCmHYYuUEeaAJZW24bso0w" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_tZF70IuUEeaAJZW24bso0w" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_tZF70YuUEeaAJZW24bso0w" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_tZF70IuUEeaAJZW24bso0w" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_tZF70YuUEeaAJZW24bso0w" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/model/validation/validation.afm b/tests/org.polarsys.capella.vp.requirements.ju/model/validation/validation.afm
index 0bc8bab6..6c988434 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/model/validation/validation.afm
+++ b/tests/org.polarsys.capella.vp.requirements.ju/model/validation/validation.afm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_-DRJwOFtEeaVyIAUbPJEpQ">
   <viewpointReferences id="_-EKhoOFtEeaVyIAUbPJEpQ" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
-  <viewpointReferences id="_BAK_wOFuEeaVyIAUbPJEpQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
-  <viewpointReferences id="_BBhDkOFuEeaVyIAUbPJEpQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_BAK_wOFuEeaVyIAUbPJEpQ" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.3"/>
+  <viewpointReferences id="_BBhDkOFuEeaVyIAUbPJEpQ" vpId="org.polarsys.capella.vp.requirements" version="0.12.3"/>
 </metadata:Metadata>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/pom.xml b/tests/org.polarsys.capella.vp.requirements.ju/pom.xml
index 61ebdb59..70048fc0 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/pom.xml
+++ b/tests/org.polarsys.capella.vp.requirements.ju/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2016, 2020 THALES GLOBAL SERVICES.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+
   SPDX-License-Identifier: EPL-2.0
 
   Contributors:
@@ -18,13 +18,13 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.addon.vp.requirements</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.12.3-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
 	<artifactId>org.polarsys.capella.vp.requirements.ju</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.12.3-SNAPSHOT</version>
 	
 	<properties>
     	<sonar.skip>true</sonar.skip>
diff --git a/tests/org.polarsys.capella.vp.requirements.ju/src/org/polarsys/capella/vp/requirements/ju/preferences/KeepXHTMLTagsTest.java b/tests/org.polarsys.capella.vp.requirements.ju/src/org/polarsys/capella/vp/requirements/ju/preferences/KeepXHTMLTagsTest.java
index 586580f6..b6b42e36 100644
--- a/tests/org.polarsys.capella.vp.requirements.ju/src/org/polarsys/capella/vp/requirements/ju/preferences/KeepXHTMLTagsTest.java
+++ b/tests/org.polarsys.capella.vp.requirements.ju/src/org/polarsys/capella/vp/requirements/ju/preferences/KeepXHTMLTagsTest.java
@@ -13,9 +13,13 @@
 package org.polarsys.capella.vp.requirements.ju.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.polarsys.capella.core.transition.common.context.TransitionContext;
 import org.polarsys.capella.test.framework.api.BasicTestCase;
 import org.polarsys.capella.vp.requirements.importer.preferences.RequirementsPreferencesConstants;
 import org.polarsys.capella.vp.requirements.importer.preferences.RequirementsPreferencesPlugin;
+import org.polarsys.capella.vp.requirements.importer.transposer.bridge.ReqIFTextParser;
+import org.polarsys.kitalpha.vp.requirements.Requirements.Requirement;
+import org.polarsys.kitalpha.vp.requirements.Requirements.RequirementsFactory;
 import org.polarsys.kitalpha.vp.requirements.model.helpers.LabelHelper;
 
 public class KeepXHTMLTagsTest extends BasicTestCase {
@@ -24,7 +28,10 @@ public class KeepXHTMLTagsTest extends BasicTestCase {
   private final String BR_TAG = "<br/>";
   private final String DIV_TAG = "<div>";
   private final String DIV_END_TAG = "/div";
-  private String testString = "Test text<xhtml:br/>";
+  private String testString = "<xhtml:div>Test text <xhtml:br/></xhtml:div>";
+  private String testQuotes = "<xhtml:div>Capella &quot;&lt;is&gt;&quot; great <xhtml:a href=\"to%20.pdf\">here</xhtml:a></xhtml:div>";
+  private String expectedResultWithoutTags= "Capella \"<is>\" great here";
+  private String expectedResultWithTags = "<div>Capella \"&lt;is&gt;\" great <a href=\"to%20.pdf\">here</a></div>";
   private IPreferenceStore store = RequirementsPreferencesPlugin.getDefault().getPreferenceStore();
   
   @Override
@@ -35,10 +42,16 @@ public void test() throws Exception {
   
   public void testWithTags() {
     store.setValue(RequirementsPreferencesConstants.REQUIREMENT_KEEP_XHTML_TAGS, true);
-    String result = LabelHelper.transformHTMLToText(testString, DIV);
+    ReqIFTextParser parser = new ReqIFTextParser(new TransitionContext());
+    Requirement dummyRequirement = RequirementsFactory.eINSTANCE.createRequirement();
+    String result = parser.transformToHTML(testString, dummyRequirement);
+    
     assertTrue(result.indexOf(BR_TAG) >= 0);
     assertEquals(result.indexOf(DIV_TAG), 0);
     assertTrue(result.indexOf(DIV_END_TAG) >= 0);
+    
+    String resultQuotes = parser.transformToHTML(testQuotes, dummyRequirement);
+    assertEquals(resultQuotes, expectedResultWithTags);
   }
   
   public void testWithoutTags() {
@@ -47,6 +60,9 @@ public void testWithoutTags() {
     assertTrue(result.indexOf(BR_TAG) < 0);
     assertTrue(result.indexOf(DIV_TAG) < 0);
     assertTrue(result.indexOf(DIV_END_TAG) < 0);
+    
+    String resultTestWithQuotes = LabelHelper.transformHTMLToText(testQuotes);
+    assertEquals(resultTestWithQuotes, expectedResultWithoutTags);
   }
 
 }