diff --git a/cave/build/lib/ant/FeatureExplorer.jar b/cave/build/lib/ant/FeatureExplorer.jar
index 580b37a8f1..77481e0c2c 100644
Binary files a/cave/build/lib/ant/FeatureExplorer.jar and b/cave/build/lib/ant/FeatureExplorer.jar differ
diff --git a/cave/build/lib/ant/IncludesGen.jar b/cave/build/lib/ant/IncludesGen.jar
index fcd671fd0f..c62ffeeab9 100644
Binary files a/cave/build/lib/ant/IncludesGen.jar and b/cave/build/lib/ant/IncludesGen.jar differ
diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index ea42ca9f5a..b94fdc6019 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -139,12 +139,23 @@
 
 			<var name="destination.directory" value="${edex.root.directory}/lib/plugins" />
 			<mkdir dir="${destination.directory}" />
-			<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
-			<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
+			<if>
+				<isset property="optionaldirectories" />
+				<then>
+					<var name="allDir" value="${basedirectories};${optionaldirectories}" />
+					<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${allDir}" destination.directory="${destination.directory}" />
+					<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${allDir}" destination.directory="${destination.directory}" />
+				</then>
+				<else>
+					<processPlugins includes.file="${includes.directory}/plugins.includes" plugin.type="plugins" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
+					<processPlugins includes.file="${includes.directory}/core.includes" plugin.type="core" plugin.directories="${basedirectories}" destination.directory="${destination.directory}" />
+				</else>
+			</if>
+
+
 
 			<var name="destination.directory" value="${edex.root.directory}/lib/dependencies" />
 			<mkdir dir="${destination.directory}" />
-
 			<if>
 				<isset property="optionaldirectories" />
 				<then>
diff --git a/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar b/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar
index 580b37a8f1..77481e0c2c 100644
Binary files a/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar and b/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar differ
diff --git a/edexOsgi/build.edex/lib/ant/IncludesGen.jar b/edexOsgi/build.edex/lib/ant/IncludesGen.jar
index fcd671fd0f..c62ffeeab9 100644
Binary files a/edexOsgi/build.edex/lib/ant/IncludesGen.jar and b/edexOsgi/build.edex/lib/ant/IncludesGen.jar differ