diff --git a/.gitignore b/.gitignore
index 672c0c5e658..35b73bd2e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ check_code_cleanliness_workspace/
 .META-INF_MANIFEST.MF
 *.takari_issue_192
 *.log
+.tycho-consumer-pom.xml
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index cf0eb91c71e..8cac6c9235b 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho-build</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
   </extension>
 </extensions>
diff --git a/pom.xml b/pom.xml
index 16f1208e5f1..66213631bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 			 runs with. It may work with older versions, but this is not
 			 tested or supported. -->
 		<required-maven-version>3.6.3</required-maven-version>
-		<tycho-version>2.7.0</tycho-version>
+		<tycho-version>2.7.1</tycho-version>
 		<cbi-plugins.version>1.3.2</cbi-plugins.version>
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh
index 2ba565a3fab..dcc1ce66ad0 100755
--- a/releng/scripts/check_code_cleanliness.sh
+++ b/releng/scripts/check_code_cleanliness.sh
@@ -56,6 +56,7 @@ ${DIR}/check_glibc_dependencies.sh
 ##
 # Make sure all versions have been bumped appropriately compared to the baseline
 ##
+java -XX:+PrintFlagsFinal -version 
 logfile=baseline-compare-and-replace.log
 echo "Running 'mvn verify -P baseline-compare-and-replace' to make sure all versions"
 echo "have been appropriately incremented. The check output is very verbose, so it is"
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
index f015e52eb3a..ca14b2c85b0 100644
--- a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml
@@ -35,10 +35,11 @@
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.connector.process"/>
-      <import plugin="org.eclipse.tm.terminal.control"/>
+      <import plugin="org.eclipse.tm.terminal.connector.process" version="4.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="4.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.control.feature"/>
+      <import plugin="org.eclipse.cdt.core.native"/>
    </requires>
 
    <plugin
diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
index d420e3c6d3f..8c94506cfb4 100644
--- a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
@@ -32,9 +32,10 @@
    <requires>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.view.core"/>
-      <import plugin="org.eclipse.tm.terminal.control"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal.view.core" version="4.8.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal.control" version="5.2.0" match="compatible"/>
    </requires>
 
    <plugin