diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
index 6f9368e4b..990f9c353 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.15.2 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.2 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.3 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.3 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/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath
index a7bc71215..7931ec26b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath
index 81fe078c2..7931ec26b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
index 93e09ea77..b9964c696 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.15.2.qualifier"
+      version="3.15.3.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 74e87c9fc..69de04624 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.15.2-SNAPSHOT</version>
+  <version>3.15.3-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 bcd94339f..70a455c25 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"
-      version="3.15.2.qualifier"
+      version="3.15.3.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 92c118e0f..9fdff7083 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.15.2-SNAPSHOT</version>
+  <version>3.15.3-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 fe4eec21a..c51eecfe1 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.15.2.qualifier"
+      version="3.15.3.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 1b7681542..fedd845ac 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.15.2">
-	<feature name="ecf-rs-dependencies-supplement" version="3.15.2" description="ECF 3.15.2 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+	name="ecf-remoteservices-sdk-3.15.3">
+	<feature name="ecf-rs-dependencies-supplement" version="3.15.3" description="ECF 3.15.3 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.15.2"
-		description="ECF 3.15.2 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
-		<feature version="3.15.2">ecf-rs-dependencies-supplement</feature>
+	<feature name="ecf-rs-dependencies" version="3.15.3"
+		description="ECF 3.15.3 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<feature version="3.15.3">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.15.2"
+	<feature name="ecf-rs-core" version="3.15.3"
 		description="ECF Core">
-		<feature version="3.15.2">ecf-rs-dependencies</feature>
+		<feature version="3.15.3">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.15.2"
+	<feature name="ecf-rs-console" version="3.15.3"
 		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.15.2"
+	<feature name="ecf-rs-rsa-impl" version="3.15.3"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.15.2">ecf-rs-core</feature>
+		<feature version="3.15.3">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.15.2"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.15.3"
 		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.15.2"
-		description="ECF 3.15.2 Remote Service Admin">
-		<feature version="3.15.2">ecf-rs-rsa-impl</feature>
-		<feature version="3.15.2">ecf-rs-rsa-topology-manager</feature>
+	<feature name="ecf-rs-rsa" version="3.15.3"
+		description="ECF 3.15.3 Remote Service Admin">
+		<feature version="3.15.3">ecf-rs-rsa-impl</feature>
+		<feature version="3.15.3">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.15.2"
+	<feature name="ecf-rs-distribution-generic" version="3.15.3"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.2">ecf-rs-rsa</feature>
+		<feature version="3.15.3">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.15.2"
+	<feature name="ecf-rs-distribution-rosgi" version="3.15.3"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.2">ecf-rs-rsa</feature>
+		<feature version="3.15.3">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,56 +90,56 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.15.2"
+	<feature name="ecf-rs-discovery-jmdns" version="3.15.3"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.15.2">ecf-rs-rsa</feature>
+		<feature version="3.15.3">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-eventadmin" version="3.15.2"
-		description="ECF 3.15.2 RemoteServices SDK Distributed EventAdmin">
-		<feature version="3.15.2">ecf-rs-rsa</feature>
+	<feature name="ecf-rs-eventadmin" version="3.15.3"
+		description="ECF 3.15.3 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.15.3">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.15.2"
+		version="3.15.3"
 		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.15.2"
+		version="3.15.3"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.2">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.3">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.15.2"
+		version="3.15.3"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.2">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.3">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.15.2"
-		description="ECF 3.15.2 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.15.2">ecf-rs-distribution-generic</feature>
-		<feature version="3.15.2">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.15.2">ecf-rs-console</feature>
+	<feature name="ecf-rs-sdk" version="3.15.3"
+		description="ECF 3.15.3 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.3">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.3">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.3">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		version="3.15.2"
-		description="ECF 3.15.2 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.15.2">ecf-rs-distribution-generic</feature>
-		<feature version="3.15.2">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.15.2">ecf-rs-console</feature>
-		<feature version="3.15.2">ecf-rs-examples-timeservice-host</feature>
+		version="3.15.3"
+		description="ECF 3.15.3 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.3">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.3">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.3">ecf-rs-console</feature>
+		<feature version="3.15.3">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 8d10a837d..9c6680ecd 100644
--- a/releng/org.eclipse.ecf.releng.repository/pom.xml
+++ b/releng/org.eclipse.ecf.releng.repository/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.releng.repository</artifactId>
-  <version>3.15.2-SNAPSHOT</version>
+  <version>3.15.3-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml
index 097266f4b..2ef41b816 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" immediate="true" name="org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" immediate="true" name="org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent">
    <reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
    <implementation class="org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent"/>
 </scr:component>
\ No newline at end of file