diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..b9e927e
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,47 @@
+# Community Code of Conduct
+
+**Version 1.2
+August 19, 2020**
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as community members, contributors, committers, and project leaders pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+With the support of the Eclipse Foundation staff (the “Staff”), project committers and leaders are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project committers and leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the Eclipse Foundation project or its community in public spaces. Examples of representing a project or community include posting via an official social media account, or acting as a project representative at an online or offline event. Representation of a project may be further defined and clarified by project committers, leaders, or the EMO.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Staff at codeofconduct@eclipse.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The Staff is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project committers or leaders who do not follow the Code of Conduct in good faith may face temporary or permanent repercussions as determined by the Staff.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
index b32ae38..acd0aec 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_core.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
index a375e9f..062f824 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_core.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index 4f276f6..be662c1 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_sdk.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
index 89d6ff8..7327640 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index d4389de..06fa7b0 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_tests.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
index 9080adf..d840c30 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_tests.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 4e33def..860fc83 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_ui.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.jst.jee.ui"
       license-feature="org.eclipse.license"
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index cddef84..5b7b340 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
index 6995c51..2592db1 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_core.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
index a4f90c6..07b9233 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_core.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
index b1d7b73..3731885 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.jst.web_js_support.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
index d9a929a..622296d 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_js_support.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
index 99bcb14..dff5b5a 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_sdk.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
index a970290..2fd4212 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_sdk.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
index 8ab0c85..426c655 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_tests.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
index d285085..10297e5 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_tests.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
index fb1b5c0..302b65f 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_ui.feature"
       label="%featureName"
-      version="3.30.0.qualifier"
+      version="3.31.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
index bfd2a4c..b140161 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_ui.feature</artifactId>
-  <version>3.30.0-SNAPSHOT</version>
+  <version>3.31.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>