diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
index f559eb0a9..d435aa8d2 100644
--- a/doc/bundles/org.eclipse.ecf.doc/pom.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -30,8 +30,8 @@
                   <additionalArgument>-Xdoclint:none</additionalArgument>
                   <additionalArgument>-splitindex</additionalArgument>
                   <additionalArgument>-use</additionalArgument>
-                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.16.6 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.16.6 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.16.7 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.16.7 API"</additionalArgument>
                   <additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
                   <additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
                   <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
diff --git a/framework/bundles/org.eclipse.ecf.ai.mcp.transports.uds/.project b/framework/bundles/org.eclipse.ecf.ai.mcp.transports.uds/.project
new file mode 100644
index 000000000..7f3560502
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ai.mcp.transports.uds/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ecf.mcp.ai.transports.uds</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
index 99d4468bb..d62c2457e 100644
--- a/releng/features/org.eclipse.ecf.core/feature.xml
+++ b/releng/features/org.eclipse.ecf.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF SDK for Eclipse"
-      version="3.16.6.qualifier"
+      version="3.16.7.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"
diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml
index 13a598e6d..c06bf4a1f 100644
--- a/releng/features/org.eclipse.ecf.core/pom.xml
+++ b/releng/features/org.eclipse.ecf.core/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.core</artifactId>
-  <version>3.16.6-SNAPSHOT</version>
+  <version>3.16.7-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
index 2152d3048..dba10f565 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature"
       label="ECF Remote Services SDK for Bndtools"
-      version="3.16.6.qualifier"
+      version="3.16.7.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
index 19699ca5e..4ea4e40fe 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
-  <version>3.16.6-SNAPSHOT</version>
+  <version>3.16.7-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
index 3490148e5..55d0798ba 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature"
       label="ECF Remote Services SDK for Eclipse"
-      version="3.16.6.qualifier"
+      version="3.16.7.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
index 76fddd3eb..e8bc4f74d 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
-  <version>3.16.6-SNAPSHOT</version>
+  <version>3.16.7-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
index 517125b56..a1bcd000d 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
       label="ECF Remote Services SDK for OSGi clients and servers"
-      version="3.16.6.qualifier"
+      version="3.16.7.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
index 05b1c87e5..96ef84013 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
-  <version>3.16.6-SNAPSHOT</version>
+  <version>3.16.7-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
index b8628aa03..3d39cf232 100644
--- a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature"
       label="ECF Remote Services Bndtools Support"
-      version="1.4.0.qualifier"
+      version="1.4.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="bndtools.main.feature" version="7.1.0" match="compatible"/>
+      <import feature="bndtools.main.feature" version="7.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
index 7269ac017..60241bc4c 100644
--- a/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools.feature</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
index 97c041ecd..429027529 100644
--- a/releng/features/org.eclipse.ecf.sdk/feature.xml
+++ b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.16.6.qualifier"
+      version="3.16.7.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
index ba718ab4e..397c1a093 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	name="ecf-remoteservices-sdk-3.16.6">
-	<feature name="ecf-rs-dependencies-supplement" version="3.16.6" description="ECF 3.16.6 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+	name="ecf-remoteservices-sdk-3.16.7">
+	<feature name="ecf-rs-dependencies-supplement" version="3.16.7" description="ECF 3.16.7 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
 		<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
 	</feature>		
 
-	<feature name="ecf-rs-dependencies" version="3.16.6"
-		description="ECF 3.16.6 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
-		<feature version="3.16.6">ecf-rs-dependencies-supplement</feature>
+	<feature name="ecf-rs-dependencies" version="3.16.7"
+		description="ECF 3.16.7 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<feature version="3.16.7">ecf-rs-dependencies-supplement</feature>
 		<bundle>
 			mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
 		</bundle>
@@ -21,9 +21,9 @@
 		<feature>eventadmin</feature>
 	</feature>
 	
-	<feature name="ecf-rs-core" version="3.16.6"
+	<feature name="ecf-rs-core" version="3.16.7"
 		description="ECF Core">
-		<feature version="3.16.6">ecf-rs-dependencies</feature>
+		<feature version="3.16.7">ecf-rs-dependencies</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
 		<bundle>
@@ -39,16 +39,16 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-console" version="3.16.6"
+	<feature name="ecf-rs-console" version="3.16.7"
 		description="ECF Console">
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-impl" version="3.16.6"
+	<feature name="ecf-rs-rsa-impl" version="3.16.7"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.16.6">ecf-rs-core</feature>
+		<feature version="3.16.7">ecf-rs-core</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
 		</bundle>
@@ -59,28 +59,28 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-topology-manager" version="3.16.6"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.16.7"
 		description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa" version="3.16.6"
-		description="ECF 3.16.6 Remote Service Admin">
-		<feature version="3.16.6">ecf-rs-rsa-impl</feature>
-		<feature version="3.16.6">ecf-rs-rsa-topology-manager</feature>
+	<feature name="ecf-rs-rsa" version="3.16.7"
+		description="ECF 3.16.7 Remote Service Admin">
+		<feature version="3.16.7">ecf-rs-rsa-impl</feature>
+		<feature version="3.16.7">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.16.6"
+	<feature name="ecf-rs-distribution-generic" version="3.16.7"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.16.6">ecf-rs-rsa</feature>
+		<feature version="3.16.7">ecf-rs-rsa</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-distribution-rosgi" version="3.16.6"
+	<feature name="ecf-rs-distribution-rosgi" version="3.16.7"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.16.6">ecf-rs-rsa</feature>
+		<feature version="3.16.7">ecf-rs-rsa</feature>
 		<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -90,62 +90,62 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.16.6"
+	<feature name="ecf-rs-discovery-jmdns" version="3.16.7"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.16.6">ecf-rs-rsa</feature>
+		<feature version="3.16.7">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</feature>
-	<feature name="ecf-ai-mcp" version="3.16.6"
-		description="ECF 3.16.6 AI Model Context Protocol Remote Tool Support">
+	<feature name="ecf-ai-mcp" version="3.16.7"
+		description="ECF 3.16.7 AI Model Context Protocol Remote Tool Support">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.ai.mcp.tools
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-eventadmin" version="3.16.6"
-		description="ECF 3.16.6 RemoteServices SDK Distributed EventAdmin">
-		<feature version="3.16.6">ecf-rs-rsa</feature>
+	<feature name="ecf-rs-eventadmin" version="3.16.7"
+		description="ECF 3.16.7 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.16.7">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-api"
-		version="3.16.6"
+		version="3.16.7"
 		description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.async_2.1.100.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-host"
-		version="3.16.6"
+		version="3.16.7"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.16.6">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.16.7">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.host_1.1.300.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-consumer-async"
-		version="3.16.6"
+		version="3.16.7"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.16.6">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.16.7">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.consumer.ds.async_1.0.200.v20200611-1508.jar
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-sdk" version="3.16.6"
-		description="ECF 3.16.6 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.16.6">ecf-rs-distribution-generic</feature>
-		<feature version="3.16.6">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.16.6">ecf-rs-console</feature>
+	<feature name="ecf-rs-sdk" version="3.16.7"
+		description="ECF 3.16.7 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.16.7">ecf-rs-distribution-generic</feature>
+		<feature version="3.16.7">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.16.7">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		version="3.16.6"
-		description="ECF 3.16.6 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.16.6">ecf-rs-distribution-generic</feature>
-		<feature version="3.16.6">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.16.6">ecf-rs-console</feature>
-		<feature version="3.16.6">ecf-rs-examples-timeservice-host</feature>
+		version="3.16.7"
+		description="ECF 3.16.7 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.16.7">ecf-rs-distribution-generic</feature>
+		<feature version="3.16.7">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.16.7">ecf-rs-console</feature>
+		<feature version="3.16.7">ecf-rs-examples-timeservice-host</feature>
 	</feature>
 	<repository>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
 	<!-- Include Py4j RemoteServicesProvider -->
diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
index 420537799..49dd1f625 100644
--- a/releng/org.eclipse.ecf.releng.repository/pom.xml
+++ b/releng/org.eclipse.ecf.releng.repository/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.releng.repository</artifactId>
-  <version>3.16.6-SNAPSHOT</version>
+  <version>3.16.7-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
index b4060d69b..3f8b4ef7f 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.bndtools;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.1.qualifier
 Import-Package: org.eclipse.core.resources,
  org.eclipse.jface.resource,
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties
index 380f06318..064f01404 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/build.properties
@@ -9,6 +9,4 @@ bin.includes = META-INF/,\
                icons/
 src.includes = ECF Remote Service Bndtools Tooling.launch,\
                about.html,\
-               OSGI-INF/,\
-               icons/,\
-               plugin.xml
+               icons/
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
index 474074000..674bce8d7 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>