diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
index 5ebb1d31739..9a065ad9a14 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
@@ -79,6 +79,8 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
 			for (IResource child : cProj.getProject().getFolder(".csettings").members())
 				child.setReadOnly(false);
 		}
+		// Wait for a few seconds for the indexer to get going so we avoid deadlock
+		Thread.sleep(2000);
 		// Delete the project
 		CProjectHelper.delete(cProj);
 	}
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index b546001a175..c4bd1c14f79 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -15,6 +15,14 @@
 	<artifactId>org.eclipse.cdt.core.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
+	<repositories>
+		<repository>
+			<id>cdt.repo</id>
+			<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -28,6 +36,13 @@
 						<include>**/AutomatedIntegrationSuite.*</include>
 					</includes>
 					<testFailureIgnore>true</testFailureIgnore>
+					<dependencies>
+						<dependency>
+							<artifactId>org.eclipse.cdt.feature.group</artifactId>
+							<version>8.0.0.${buildQualifier}</version>
+							<type>p2-installable-unit</type>
+						</dependency>
+					</dependencies>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/debug/org.eclipse.cdt.debug.mi.core/pom.xml b/debug/org.eclipse.cdt.debug.mi.core/pom.xml
index 0c59ddbe0f3..d5abf34fcd2 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/pom.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>7.1.100-SNAPSHOT</version>
+	<version>7.2.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.mi.core</artifactId>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/doc/org.eclipse.cdt.doc.isv/.gitignore b/doc/org.eclipse.cdt.doc.isv/.gitignore
new file mode 100644
index 00000000000..146679de06d
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.isv/.gitignore
@@ -0,0 +1 @@
+/cdtconvert.txt
diff --git a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
index d9fcd46e48e..7a76a664384 100644
--- a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
+++ b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
@@ -10,13 +10,13 @@
 	<target name="convertSchemaToHtml" if="eclipse.running">
 		<property name="dest" value="reference/extension-points" />
 	    <record name="${basedir}/cdtconvert.txt" action="start"/>
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.ui/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.core/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.ui/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.core/plugin.xml" destination="${dest}" />
-	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.ui/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../core/org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../core/org.eclipse.cdt.ui/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../debug/org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.make.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.make.ui/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.managedbuilder.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.managedbuilder.ui/plugin.xml" destination="${dest}" />
 	    <record name="${basedir}/cdtconvert.txt" action="stop"/>
 	</target>
 	
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/.project b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/.project
new file mode 100644
index 00000000000..485db0235a8
--- /dev/null
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.debug.ui.memory.source-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/build.properties b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/build.properties
new file mode 100644
index 00000000000..82ab19c62d1
--- /dev/null
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/eclipse_update_120.jpg b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/eclipse_update_120.jpg
similarity index 100%
rename from memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/eclipse_update_120.jpg
rename to memory/org.eclipse.cdt.debug.ui.memory.source-feature/eclipse_update_120.jpg
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/epl-v10.html b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/epl-v10.html
similarity index 100%
rename from memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/epl-v10.html
rename to memory/org.eclipse.cdt.debug.ui.memory.source-feature/epl-v10.html
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.properties
similarity index 100%
rename from memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties
rename to memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.properties
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml
new file mode 100644
index 00000000000..ba5af59d3e3
--- /dev/null
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.debug.ui.memory.source"
+      label="%featureName"
+      version="2.1.100.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/indigo"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.search.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.traditional.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.transport.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.memorybrowser.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/license.html b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/license.html
similarity index 100%
rename from memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/license.html
rename to memory/org.eclipse.cdt.debug.ui.memory.source-feature/license.html
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml
new file mode 100644
index 00000000000..b2d166ec30a
--- /dev/null
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>cdt-parent</artifactId>
+		<version>8.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<version>2.1.100-SNAPSHOT</version>
+	<artifactId>org.eclipse.cdt.debug.ui.memory.source</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/p2/org.eclipse.cdt.p2-feature/feature.xml b/p2/org.eclipse.cdt.p2-feature/feature.xml
index bf7113a479a..fc064fd796d 100644
--- a/p2/org.eclipse.cdt.p2-feature/feature.xml
+++ b/p2/org.eclipse.cdt.p2-feature/feature.xml
@@ -25,4 +25,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.cdt.p2.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/pom.xml b/pom.xml
index d95c11aa363..648f40a742b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
 		<module>memory/org.eclipse.cdt.debug.ui.memory.traditional</module>
 		<module>memory/org.eclipse.cdt.debug.ui.memory.transport</module>
 		<module>memory/org.eclipse.cdt.debug.ui.memory-feature</module>
+		<module>memory/org.eclipse.cdt.debug.ui.memory.source-feature</module>
 
 		<module>cross/org.eclipse.cdt.build.crossgcc</module>
 		<module>cross/org.eclipse.cdt.build.crossgcc-feature</module>
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 0fe4e12d064..bd60fda1282 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -9,6 +9,7 @@
    <feature url="features/org.eclipse.cdt.xlc.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.xlc.feature" version="0.0.0"/>
    <feature url="features/org.eclipse.cdt.util_0.0.0.qualifier.jar" id="org.eclipse.cdt.util" version="0.0.0"/>
    <feature url="features/org.eclipse.cdt.debug.ui.memory_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.ui.memory" version="0.0.0"/>
+   <feature url="features/org.eclipse.cdt.debug.ui.memory.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.ui.memory.source" version="0.0.0"/>
    <feature url="features/org.eclipse.cdt.build.crossgcc_0.0.0.qualifier.jar" id="org.eclipse.cdt.build.crossgcc" version="0.0.0"/>
    <feature url="features/org.eclipse.cdt.launch.remote_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.remote" version="0.0.0"/>
    <feature url="features/org.eclipse.cdt.msw_0.0.0.qualifier.jar" id="org.eclipse.cdt.msw" version="0.0.0"/>