diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index f285cef162..15105fd1e2 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -245,6 +245,10 @@
 			<param name="feature"
 				value="com.raytheon.uf.viz.ncep.core.feature" />
 		</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature"
+				value="com.raytheon.uf.viz.aviation.advisory.feature" />
+		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.uf.viz.ncep.dataplugins.feature" />
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index df253fa979..33a6c52b06 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -28,7 +28,7 @@
    <includes
          id="com.raytheon.uf.viz.common.core.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.localization.perspective.feature"
          version="0.0.0"/>
@@ -36,7 +36,7 @@
    <includes
          id="com.raytheon.uf.viz.core.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.core.maps.feature"
          version="0.0.0"/>
@@ -88,19 +88,19 @@
    <includes
          id="com.raytheon.uf.viz.ncep.core.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.ncep.dataplugins.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.viz.hydro.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.d2d.xy.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.ncep.displays.feature"
          version="0.0.0"/>
@@ -108,31 +108,31 @@
    <includes
          id="com.raytheon.uf.viz.ncep.nsharp.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.d2d.nsharp.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.archive.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.ncep.perspective.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.nwsauth.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.thinclient.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.useradmin.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.kml.export.feature"
          version="0.0.0"/>
@@ -140,7 +140,7 @@
    <includes
          id="com.raytheon.uf.viz.npp.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.d2d.skewt.feature"
          version="0.0.0"/>
@@ -148,11 +148,11 @@
    <includes
          id="com.raytheon.viz.volumebrowser.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.acarssounding.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.viz.avnfps.feature"
          version="0.0.0"/>
@@ -176,10 +176,14 @@
    <includes
          id="com.raytheon.uf.viz.d2d.ui.awips.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.viz.registry.feature"
-         version="0.0.0"/>         
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.aviation.advisory.feature"
+         version="0.0.0"/>
 
    <requires>
       <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
diff --git a/ncep/com.raytheon.uf.viz.aviation.advisory.feature/.project b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/.project
new file mode 100644
index 0000000000..cfe004f895
--- /dev/null
+++ b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.viz.aviation.advisory.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/ncep/com.raytheon.uf.viz.aviation.advisory.feature/build.properties b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/ncep/com.raytheon.uf.viz.aviation.advisory.feature/feature.xml b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/feature.xml
new file mode 100644
index 0000000000..54c13da588
--- /dev/null
+++ b/ncep/com.raytheon.uf.viz.aviation.advisory.feature/feature.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.raytheon.uf.viz.aviation.advisory.feature"
+      label="Aviation Advisory Feature"
+      version="1.14.0.qualifier"
+      provider-name="RAYTHEON">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="com.raytheon.uf.viz.aviation.advisory"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.airmet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.convsigmet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.intlsigmet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/ncep/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml b/ncep/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
index d6255876d3..685d85e6b7 100644
--- a/ncep/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
+++ b/ncep/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
@@ -23,13 +23,6 @@
       <import feature="com.raytheon.uf.viz.ncep.core.feature" version="1.0.0.qualifier"/>
    </requires>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.airmet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.nasa.gsfc.fits"
          download-size="0"
@@ -37,27 +30,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.convsigmet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.intlsigmet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="gov.noaa.nws.ncep.edex.plugin.mosaic"
          download-size="0"
@@ -211,18 +183,18 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.airep"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
-         
+
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.pirep"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>                  
+         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.uf.common.remote.script"
diff --git a/ncep/com.raytheon.uf.viz.ncep.displays.feature/feature.xml b/ncep/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
index 056c99f0c1..f1a7829b75 100644
--- a/ncep/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
+++ b/ncep/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
@@ -29,14 +29,9 @@
       <import feature="com.raytheon.viz.grib.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.viz.aviation.advisory.feature" version="1.14.0.qualifier"/>
    </requires>
 
-   <plugin
-         id="com.raytheon.uf.viz.aviation.advisory"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="gov.noaa.nws.ncep.gempak.parameterConversionLibrary"
          download-size="0"