diff --git a/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
index 09e4f25..a1c54b4 100644
--- a/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.ide;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Require-Bundle: org.eclipse.mylyn.tasks.core;bundle-version="[3.8.0,4.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.bugzilla.ide/pom.xml b/org.eclipse.mylyn.bugzilla.ide/pom.xml
index 390d355..43e6cb7 100644
--- a/org.eclipse.mylyn.bugzilla.ide/pom.xml
+++ b/org.eclipse.mylyn.bugzilla.ide/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.bugzilla.ide</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.cdt-feature/feature.xml b/org.eclipse.mylyn.cdt-feature/feature.xml
index 1ffc953..fc28098 100644
--- a/org.eclipse.mylyn.cdt-feature/feature.xml
+++ b/org.eclipse.mylyn.cdt-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.cdt.mylyn"
       label="%featureName"
-      version="5.16.0.qualifier"
+      version="5.17.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -32,7 +32,7 @@
 
    <requires>
       <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.20.0" match="compatible"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.21.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.cdt-feature/pom.xml b/org.eclipse.mylyn.cdt-feature/pom.xml
index a4fedcb..0f72d0a 100644
--- a/org.eclipse.mylyn.cdt-feature/pom.xml
+++ b/org.eclipse.mylyn.cdt-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.cdt.mylyn</artifactId>
-  <version>5.16.0-SNAPSHOT</version>
+  <version>5.17.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
index 678f452..3b5c14f 100644
--- a/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn CDT Tests
 Bundle-SymbolicName: org.eclipse.mylyn.cdt.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.cdt.tests/pom.xml b/org.eclipse.mylyn.cdt.tests/pom.xml
index 5e9dc6d..ce22cde 100644
--- a/org.eclipse.mylyn.cdt.tests/pom.xml
+++ b/org.eclipse.mylyn.cdt.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.cdt.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllCdtTests</test.suite>
diff --git a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
index d843ddb..e52a91c 100644
--- a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.cdt.mylyn.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.cdt.ui/pom.xml b/org.eclipse.mylyn.cdt.ui/pom.xml
index 5ce7c4c..4ee8890 100644
--- a/org.eclipse.mylyn.cdt.ui/pom.xml
+++ b/org.eclipse.mylyn.cdt.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.cdt.mylyn.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context-feature/feature.xml b/org.eclipse.mylyn.context-feature/feature.xml
index 5f096c4..cd35228 100644
--- a/org.eclipse.mylyn.context-feature/feature.xml
+++ b/org.eclipse.mylyn.context-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context_feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn_feature" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn_feature" version="3.21.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.context-feature/pom.xml b/org.eclipse.mylyn.context-feature/pom.xml
index 1ed0476..0235d0a 100644
--- a/org.eclipse.mylyn.context-feature/pom.xml
+++ b/org.eclipse.mylyn.context-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context_feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.context-site/pom.xml b/org.eclipse.mylyn.context-site/pom.xml
index e751189..e7462f3 100644
--- a/org.eclipse.mylyn.context-site/pom.xml
+++ b/org.eclipse.mylyn.context-site/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context-site</artifactId>
   <packaging>eclipse-update-site</packaging>
diff --git a/org.eclipse.mylyn.context-target/pom.xml b/org.eclipse.mylyn.context-target/pom.xml
index edd7047..f0ca9a9 100644
--- a/org.eclipse.mylyn.context-target/pom.xml
+++ b/org.eclipse.mylyn.context-target/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context-target</artifactId>
   <packaging>pom</packaging>
diff --git a/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
index a886560..29be7dd 100644
--- a/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.core;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.context.core.ContextCorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.context.core/pom.xml b/org.eclipse.mylyn.context.core/pom.xml
index 8429c9c..ff1c284 100644
--- a/org.eclipse.mylyn.context.core/pom.xml
+++ b/org.eclipse.mylyn.context.core/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.core</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.development-feature/feature.xml b/org.eclipse.mylyn.context.development-feature/feature.xml
index ce92b5a..90e2da9 100644
--- a/org.eclipse.mylyn.context.development-feature/feature.xml
+++ b/org.eclipse.mylyn.context.development-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context.development"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.mylyn.context.development-feature/pom.xml b/org.eclipse.mylyn.context.development-feature/pom.xml
index 2dcd416..45e013d 100644
--- a/org.eclipse.mylyn.context.development-feature/pom.xml
+++ b/org.eclipse.mylyn.context.development-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.development</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.mylyn.context.sdk-feature/feature.xml b/org.eclipse.mylyn.context.sdk-feature/feature.xml
index 8b8a0ea..336491e 100644
--- a/org.eclipse.mylyn.context.sdk-feature/feature.xml
+++ b/org.eclipse.mylyn.context.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context.sdk"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.mylyn.context.sdk-feature/pom.xml b/org.eclipse.mylyn.context.sdk-feature/pom.xml
index 4432079..04fd33e 100644
--- a/org.eclipse.mylyn.context.sdk-feature/pom.xml
+++ b/org.eclipse.mylyn.context.sdk-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
index 817ba81..318772b 100644
--- a/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context SDK Java Utilities
 Bundle-SymbolicName: org.eclipse.mylyn.context.sdk.java;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.sdk.java/pom.xml b/org.eclipse.mylyn.context.sdk.java/pom.xml
index 3559a0e..b0fc8df 100644
--- a/org.eclipse.mylyn.context.sdk.java/pom.xml
+++ b/org.eclipse.mylyn.context.sdk.java/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk.java</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
index ed48d1e..302ff5e 100644
--- a/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context SDK Utilities
 Bundle-SymbolicName: org.eclipse.mylyn.context.sdk.util;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.sdk.util/pom.xml b/org.eclipse.mylyn.context.sdk.util/pom.xml
index e571dfa..226236c 100644
--- a/org.eclipse.mylyn.context.sdk.util/pom.xml
+++ b/org.eclipse.mylyn.context.sdk.util/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk.util</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
index 34337af..709baa3 100644
--- a/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tasks Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tasks.tests/pom.xml b/org.eclipse.mylyn.context.tasks.tests/pom.xml
index 1f37df8..84a14e0 100644
--- a/org.eclipse.mylyn.context.tasks.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTasksTests</test.suite>
diff --git a/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
index a91ddb2..ba6595d 100644
--- a/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tasks UI Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.ui.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml b/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
index 63b5af8..572aa98 100644
--- a/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.ui.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTasksUiTests</test.suite>
diff --git a/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
index 75941f6..5856f20 100644
--- a/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
diff --git a/org.eclipse.mylyn.context.tasks.ui/pom.xml b/org.eclipse.mylyn.context.tasks.ui/pom.xml
index 61ab3c7..8ad28c7 100644
--- a/org.eclipse.mylyn.context.tasks.ui/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
index d507f97..9490983 100644
--- a/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tests/pom.xml b/org.eclipse.mylyn.context.tests/pom.xml
index 20461b7..4929790 100644
--- a/org.eclipse.mylyn.context.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTests</test.suite>
diff --git a/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
index 16ab65a..c5570b4 100644
--- a/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.context.ui.ContextUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.ui/pom.xml b/org.eclipse.mylyn.context.ui/pom.xml
index 442ed4e..f455253 100644
--- a/org.eclipse.mylyn.context.ui/pom.xml
+++ b/org.eclipse.mylyn.context.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
index c653761..4199d16 100644
--- a/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tests
 Bundle-SymbolicName: org.eclipse.mylyn.debug.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.debug.tests/pom.xml b/org.eclipse.mylyn.debug.tests/pom.xml
index 415e424..f008e50 100644
--- a/org.eclipse.mylyn.debug.tests/pom.xml
+++ b/org.eclipse.mylyn.debug.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.debug.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
index dc4334d..3e52f61 100644
--- a/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.debug.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.debug.ui.DebugUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.debug.ui/pom.xml b/org.eclipse.mylyn.debug.ui/pom.xml
index 81f0e58..b7d01fe 100644
--- a/org.eclipse.mylyn.debug.ui/pom.xml
+++ b/org.eclipse.mylyn.debug.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.debug.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.ide-feature/feature.xml b/org.eclipse.mylyn.ide-feature/feature.xml
index dab4d8b..bb32ad9 100644
--- a/org.eclipse.mylyn.ide-feature/feature.xml
+++ b/org.eclipse.mylyn.ide-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.ide_feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,9 +31,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.20.0" match="equivalent"/>
-      <import feature="org.eclipse.mylyn.team_feature" version="3.20.0" match="equivalent"/>
-      <import feature="org.eclipse.mylyn.tasks.ide" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.21.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.team_feature" version="3.21.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.tasks.ide" version="3.21.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.ide-feature/pom.xml b/org.eclipse.mylyn.ide-feature/pom.xml
index b80788d..5f17cfd 100644
--- a/org.eclipse.mylyn.ide-feature/pom.xml
+++ b/org.eclipse.mylyn.ide-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide_feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
index 94687e2..ba24fb4 100644
--- a/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.ide.ant;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ant.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.ide.ant/pom.xml b/org.eclipse.mylyn.ide.ant/pom.xml
index bb725d7..737e179 100644
--- a/org.eclipse.mylyn.ide.ant/pom.xml
+++ b/org.eclipse.mylyn.ide.ant/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.ant</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
index 49d5e95..c6046c1 100644
--- a/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn IDE Tests
 Bundle-SymbolicName: org.eclipse.mylyn.ide.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.ui,
diff --git a/org.eclipse.mylyn.ide.tests/pom.xml b/org.eclipse.mylyn.ide.tests/pom.xml
index bd1ac3b..acfa1c8 100644
--- a/org.eclipse.mylyn.ide.tests/pom.xml
+++ b/org.eclipse.mylyn.ide.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllIdeTests</test.suite>
diff --git a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
index 8d65db8..301965d 100644
--- a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.ide.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.ide.ui/pom.xml b/org.eclipse.mylyn.ide.ui/pom.xml
index d6d2a3f..8f7375c 100644
--- a/org.eclipse.mylyn.ide.ui/pom.xml
+++ b/org.eclipse.mylyn.ide.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.java-feature/feature.xml b/org.eclipse.mylyn.java-feature/feature.xml
index 09b8226..d53a10a 100644
--- a/org.eclipse.mylyn.java-feature/feature.xml
+++ b/org.eclipse.mylyn.java-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.java_feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.21.0" match="equivalent"/>
       <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.java-feature/pom.xml b/org.eclipse.mylyn.java-feature/pom.xml
index df5745d..c447b90 100644
--- a/org.eclipse.mylyn.java-feature/pom.xml
+++ b/org.eclipse.mylyn.java-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java_feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
index f9335a8..746ba67 100644
--- a/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.java.tasks;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
diff --git a/org.eclipse.mylyn.java.tasks/pom.xml b/org.eclipse.mylyn.java.tasks/pom.xml
index 17bd639..7cca140 100644
--- a/org.eclipse.mylyn.java.tasks/pom.xml
+++ b/org.eclipse.mylyn.java.tasks/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.tasks</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
index 7621f39..67d4698 100644
--- a/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Java Tests
 Bundle-SymbolicName: org.eclipse.mylyn.java.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.java.tests/pom.xml b/org.eclipse.mylyn.java.tests/pom.xml
index 6a41f81..8ea8783 100644
--- a/org.eclipse.mylyn.java.tests/pom.xml
+++ b/org.eclipse.mylyn.java.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllJavaTests</test.suite>
diff --git a/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
index 7e8d8c2..346d0f2 100644
--- a/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.java.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.java.ui/pom.xml b/org.eclipse.mylyn.java.ui/pom.xml
index 636e5f4..d060829 100644
--- a/org.eclipse.mylyn.java.ui/pom.xml
+++ b/org.eclipse.mylyn.java.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.pde-feature/feature.xml b/org.eclipse.mylyn.pde-feature/feature.xml
index 76a04e7..a0116e1 100644
--- a/org.eclipse.mylyn.pde-feature/feature.xml
+++ b/org.eclipse.mylyn.pde-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.pde_feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.java_feature" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.java_feature" version="3.21.0" match="equivalent"/>
       <import feature="org.eclipse.pde" version="3.6.0" match="compatible"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.pde-feature/pom.xml b/org.eclipse.mylyn.pde-feature/pom.xml
index 8e55759..bdf4ce3 100644
--- a/org.eclipse.mylyn.pde-feature/pom.xml
+++ b/org.eclipse.mylyn.pde-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.pde_feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
index 307cf58..956af00 100644
--- a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.pde.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.pde.ui/pom.xml b/org.eclipse.mylyn.pde.ui/pom.xml
index 92f6207..f5312e8 100644
--- a/org.eclipse.mylyn.pde.ui/pom.xml
+++ b/org.eclipse.mylyn.pde.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.pde.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
index b8bfe38..34284fd 100644
--- a/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Resources Tests
 Bundle-SymbolicName: org.eclipse.mylyn.resources.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.resources.tests/pom.xml b/org.eclipse.mylyn.resources.tests/pom.xml
index ad03fb6..2694f32 100644
--- a/org.eclipse.mylyn.resources.tests/pom.xml
+++ b/org.eclipse.mylyn.resources.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.resources.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllResourcesTests</test.suite>
diff --git a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
index 27b7cec..23fa6a7 100644
--- a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.resources.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.resources.ui/pom.xml b/org.eclipse.mylyn.resources.ui/pom.xml
index b84bd3e..cecf140 100644
--- a/org.eclipse.mylyn.resources.ui/pom.xml
+++ b/org.eclipse.mylyn.resources.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.resources.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.team-feature/feature.xml b/org.eclipse.mylyn.team-feature/feature.xml
index cb9dc8d..e01a261 100644
--- a/org.eclipse.mylyn.team-feature/feature.xml
+++ b/org.eclipse.mylyn.team-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.team_feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.21.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.team-feature/pom.xml b/org.eclipse.mylyn.team-feature/pom.xml
index 8d9c53b..41e0ca0 100644
--- a/org.eclipse.mylyn.team-feature/pom.xml
+++ b/org.eclipse.mylyn.team-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team_feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.team.cvs-feature/feature.xml b/org.eclipse.mylyn.team.cvs-feature/feature.xml
index 6c3d9d0..8992e27 100644
--- a/org.eclipse.mylyn.team.cvs-feature/feature.xml
+++ b/org.eclipse.mylyn.team.cvs-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.team.cvs"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.team_feature" version="3.20.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.team_feature" version="3.21.0" match="equivalent"/>
       <import feature="org.eclipse.cvs" version="1.2.0" match="compatible"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.team.cvs-feature/pom.xml b/org.eclipse.mylyn.team.cvs-feature/pom.xml
index bab46f5..58d9cce 100644
--- a/org.eclipse.mylyn.team.cvs-feature/pom.xml
+++ b/org.eclipse.mylyn.team.cvs-feature/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.cvs</artifactId>
   <groupId>org.eclipse.mylyn.context.features</groupId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
index dad3f97..eaf848f 100644
--- a/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.team.cvs;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.team.core,
  org.eclipse.team.cvs.ui,
diff --git a/org.eclipse.mylyn.team.cvs/pom.xml b/org.eclipse.mylyn.team.cvs/pom.xml
index fec98ff..e9ac890 100644
--- a/org.eclipse.mylyn.team.cvs/pom.xml
+++ b/org.eclipse.mylyn.team.cvs/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.cvs</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
index 252076a..16837d2 100644
--- a/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Team Tests
 Bundle-SymbolicName: org.eclipse.mylyn.team.tests;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.team.tests/pom.xml b/org.eclipse.mylyn.team.tests/pom.xml
index 19deb1e..21eadc9 100644
--- a/org.eclipse.mylyn.team.tests/pom.xml
+++ b/org.eclipse.mylyn.team.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.tests</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllTeamTests</test.suite>
diff --git a/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
index 1ddde5a..d85598e 100644
--- a/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.team.ui;singleton:=true
-Bundle-Version: 3.20.0.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.compare,
diff --git a/org.eclipse.mylyn.team.ui/pom.xml b/org.eclipse.mylyn.team.ui/pom.xml
index 3bac71d..40163c1 100644
--- a/org.eclipse.mylyn.team.ui/pom.xml
+++ b/org.eclipse.mylyn.team.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.ui</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/pom.xml b/pom.xml
index 37ac040..d7efd07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.mylyn</groupId>
     <artifactId>org.eclipse.mylyn-parent</artifactId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>3.21.0-SNAPSHOT</version>
     <relativePath>../org.eclipse.mylyn/org.eclipse.mylyn-parent</relativePath>
   </parent>
   <groupId>org.eclipse.mylyn.context</groupId>
   <artifactId>org.eclipse.mylyn.context-parent</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <name>Mylyn Context</name>
   <packaging>pom</packaging>
   <properties>
@@ -84,7 +84,7 @@
                 <artifact>
                   <groupId>org.eclipse.mylyn.context</groupId>
                   <artifactId>org.eclipse.mylyn.context-target</artifactId>
-                  <version>3.20.0-SNAPSHOT</version>
+                  <version>3.21.0-SNAPSHOT</version>
                   <classifier>mylyn-context-e3.5</classifier>
                 </artifact>
               </target>