diff --git a/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
index b3c689cabb..40099b647a 100644
--- a/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.uf.common.dataplugin.grid;bundle-version="1.0.0",
  com.raytheon.uf.common.topo;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
- com.raytheon.uf.common.parameter;bundle-version="1.0.0"
+ com.raytheon.uf.common.parameter;bundle-version="1.0.0",
+ com.raytheon.uf.viz.acarssounding;bundle-version="1.12.1174"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.sounding,
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
index b9d0fd4f78..f7678cc2cc 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
@@ -51,6 +51,7 @@ import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
 import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
+import com.raytheon.uf.viz.core.drawables.ColorMapParameters.PersistedParameters;
 import com.raytheon.uf.viz.core.drawables.IRenderable;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
@@ -596,6 +597,13 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
             // reuse the old parameters. This is useful when the resource is
             // sharing capabilities, for example in an FFGVizGroupResource.
             newParameters = oldParameters;
+        } else if (oldParameters != null) {
+            newParameters.setColorMapName(oldParameters.getColorMapName());
+            newParameters.setColorMap(oldParameters.getColorMap());
+            PersistedParameters persisted = oldParameters.getPersisted();
+            if (persisted != null) {
+                newParameters.applyPersistedParameters(persisted);
+            }
         }
         return newParameters;
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
index 10b9435be1..f45f28f45d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
@@ -196,7 +196,7 @@ public class D2DParmIdCache {
     public List<ParmID> getParmIDs(DatabaseID dbId) {
         List<ParmID> parms = Collections.emptyList();
         synchronized (parmIds) {
-            if (parmIds.containsKey(dbId.toString())) {
+            if (parmIds.containsKey(dbId)) {
                 parms = new ArrayList<ParmID>(parmIds.get(dbId));
             }
         }
@@ -255,7 +255,7 @@ public class D2DParmIdCache {
 
         synchronized (this.parmIds) {
             for (DatabaseID dbId : dbsToRemove) {
-                this.parmIds.remove(dbId.toString());
+                this.parmIds.remove(dbId);
                 if (UFStatus.getHandler().isPriorityEnabled(Priority.DEBUG)) {
                     statusHandler.handle(Priority.DEBUG,
                             "D2dParmIdCache Removed " + dbId);
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
index 60019865df..48b70d36fb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
@@ -33,7 +33,8 @@
 	<alias base="MMSP">mmsp</alias>
 	<alias base="DIRPW">dirpw</alias>
 	<alias base="PERPW">perpw</alias>
-	<alias base="PR">pr</alias>
+        <alias base="HTSGW">htsgw</alias>
+        <alias base="PR">pr</alias>
 	<alias base="CPOFP">cpofp</alias>
 	<alias base="CPOZP">cpozp</alias>
 	<alias base="PW">pw</alias>
@@ -48,7 +49,8 @@
 	<alias base="SH">sh</alias>
 	<alias base="Heli">heli</alias>
 	<alias base="SLI">sli</alias>
-	<alias base="T">t</alias>
+        <alias base="BLI">bli</alias>
+        <alias base="T">t</alias>
 	<alias base="TCC">tcc</alias>
 	<alias base="ThP">thp</alias>
 	<alias base="TP">tp</alias>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
new file mode 100644
index 0000000000..f483d69124
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
@@ -0,0 +1,61 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
+	<bean id="dpaDecodeSrv" class="com.raytheon.uf.edex.ohd.pproc.DecodeDpaSrv" />
+
+	<bean id="dpaDistRegistry" factory-bean="distributionSrv"
+		factory-method="register">
+		<constructor-arg value="dpa" />
+		<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+	</bean>
+	
+	<bean id="dpaRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
+		factory-method="register">
+		<constructor-arg value="dpa" />
+		<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+	</bean>
+
+	<camelContext id="dpa-camel"
+		xmlns="http://camel.apache.org/schema/spring"
+		errorHandlerRef="errorHandler">
+		<!--
+		<endpoint id="dpaFileEndpoint" uri="file:${edex.home}/data/sbn/dpa?noop=true&amp;idempotent=false" />
+
+		<route id="dpaFileConsumerRoute">
+			<from ref="dpaFileEndpoint" />
+			<bean ref="fileToString"  />
+			<setHeader headerName="pluginName">
+				<constant>dpa</constant>
+			</setHeader>
+			<to uri="jms-generic:queue:Ingest.dpa"/>
+		</route>
+		-->
+
+		<!-- Begin dpa Routes -->
+		<route id="dpaIngestRoute">
+			<from uri="jms-generic:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+			<setHeader headerName="pluginName">
+				<constant>dpa</constant>
+			</setHeader>
+			<doTry>
+				<pipeline>
+					<bean ref="stringToFile"  />
+					<bean ref="radarDecompressor" method="decompressToFile" />
+					<bean ref="dpaDecodeSrv" method="process"/>
+					<!-- Uncomment when dpaDecodeSrv route properly handles only its own files
+					<bean ref="processUtil" method="log"/>
+					-->
+				</pipeline>
+				<doCatch>
+					<exception>java.lang.Throwable</exception>
+					<to uri="log:dpa?level=INFO&amp;showBody=false&amp;showCaughtException=true&amp;showStackTrace=true"/>
+				</doCatch>
+			</doTry>
+		</route>
+
+	</camelContext>
+</beans>
\ No newline at end of file
diff --git a/hebbard_deletes.txt b/hebbard_deletes.txt
new file mode 100644
index 0000000000..70ff70a41e
--- /dev/null
+++ b/hebbard_deletes.txt
@@ -0,0 +1,7 @@
+cave/build/static/common/cave/etc/ncep/PgenXmlOverlayProducts
+cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tAtl
+cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tPac
+cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tTpc
+ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/gov.noaa.nws.ncep.edex.plugin.convsigmet
+ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet
+ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/util