diff --git a/edexOsgi/com.raytheon.uf.edex.ndm/modes/ndm-modes.xml b/edexOsgi/com.raytheon.uf.edex.ndm/modes/ndm-modes.xml
index 635e953186..0271d7347d 100644
--- a/edexOsgi/com.raytheon.uf.edex.ndm/modes/ndm-modes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ndm/modes/ndm-modes.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    
 <!-- 
        Refer to edex/modes/README.txt for documentation
 --> 
@@ -26,4 +6,4 @@
     <mode name="ingestHydro">
         <include>ndm-ingest.xml</include>
     </mode>
-</edexModes>
\ No newline at end of file
+</edexModes>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/distribution/goesr.xml b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/distribution/goesr.xml
index f10f39497d..eb4eff3dc1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/distribution/goesr.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.goesr/utility/common_static/base/distribution/goesr.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  GOES-16 Product                 WMO Header    Regions
+  Aerosol Detection (Smoke+Dust)  IXTA99 KNES   F,C,M
+  Aerosol Optical Depth           IXTB99 KNES   F,C
+  Cloud Top Phase                 IXTD99 KNES   F,C,M
+  Cloud Top Height                IXTG99 KNES   F,C,M
+  Cloud Top Pressure              IXTX01 KNES   F,C
+  Cloud Top Temperature           IXTI99 KNES   F,M
+  Derived Stability Indices       IXTN99 KNES   F,C,M
+  Total Precipitable Water        IXTO99 KNES   F,C,M
+  Clear Sky Mask                  IXTH99 KNES   F,C,M
+  Fire/Hot Spot Characterization  IXTJ99 KNES   F,C
+  Land Surface (Skin) Temperature IXTK99 KNES   F,C,M
+-->
 <requestPatterns xmlns:ns2="group">
-	<regex>^TI[SR]</regex>
+    <regex>^TI[SR]</regex>
+    <regex>^IXT[ABDGINOHJK]99</regex>
     <!-- This pattern is intended to match standardized Level 2 filenames, it will not be used over LDM -->
     <regex>^OR_ABI-L2-\w{3,5}(C|F|M1|M2)-M[34]_G\d\d_s\d{14}_e\d{14}_c\d{14}.nc$</regex>
 </requestPatterns>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
index 3f8881f529..ad2470f061 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    
-<!-- 
-       Refer to edex/modes/README.txt for documentation
---> 
+<!-- Refer to edex/modes/README.txt for documentation --> 
 <edexModes>
 	<mode name="ingest">
 		<exclude>grib-decode.xml</exclude>
@@ -29,21 +7,21 @@
 		<exclude>grid-staticdata-process.xml</exclude>
 	</mode>
 	<mode name="ingestGrib">
-        <include>time-common.xml</include>
-        <include>auth-common.xml</include>
-        <include>python-common.xml</include>
-        <include>grib-decode.xml</include>
-        <include>ncgrib-file-endpoint.xml</include>
-        <include>grid-staticdata-process.xml</include>
-        <include>level-common.xml</include>
-        <include>levelhandler-common.xml</include>        
-        <include>grid-common.xml</include>
-        <include>gridcoverage-common.xml</include>
-        <include>parameter-common.xml</include>	 	
-        <include>persist-ingest.xml</include>
-        <include>management-common.xml</include>
-        <include>database-common.xml</include>
-        <include>event-ingest.xml</include>
-        <includeMode>statsTemplate</includeMode>
+        	<include>time-common.xml</include>
+        	<include>auth-common.xml</include>
+        	<include>python-common.xml</include>
+        	<include>grib-decode.xml</include>
+        	<include>ncgrib-file-endpoint.xml</include>
+        	<include>grid-staticdata-process.xml</include>
+        	<include>level-common.xml</include>
+        	<include>levelhandler-common.xml</include>        
+        	<include>grid-common.xml</include>
+        	<include>gridcoverage-common.xml</include>
+        	<include>parameter-common.xml</include>	 	
+        	<include>persist-ingest.xml</include>
+        	<include>management-common.xml</include>
+        	<include>database-common.xml</include>
+        	<include>event-ingest.xml</include>
+        	<includeMode>statsTemplate</includeMode>
 	</mode>
 </edexModes>
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr
new file mode 100644
index 0000000000..c2f178966b
--- /dev/null
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr
@@ -0,0 +1,37 @@
+#
+# GOES-16(R) experimental/provisional products - large-scale non-mesoscale sectors
+#
+NOTHER	^(TIR[CU]..) (KNES) (......) (...)
+	FILE	-close -edex
+	/awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+# P=Puerto Rico, A=Alaska (inactive), H=Hawaii (inactive)
+NOTHER	^(TIR[AHP]..) (KNES) (......) (...)
+	FILE	-close -edex
+	/awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+#
+# GOES-16(R) experimental/provisional products - mesoscale sectors
+#
+NOTHER	^(TIS...) (KNES) (......) (...)
+	FILE	-close -edex
+	/awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+#
+# GOES-16(R) Derived
+# See http://www.nws.noaa.gov/os/notification/scn17-61goes1_3.htm
+#
+HDS	^(IXT[ABDGINOHJK]99) KNES (......)
+	FILE	-close -edex
+	/awips2/data_store/goesr-derived/KNES_\1_\2-(seq)
+#  Product                         WMO Header    Regions
+#  ---------------                 ----------    -------
+#  Aerosol Detection (Smoke+Dust)  IXTA99 KNES   F,C,M
+#  Aerosol Optical Depth           IXTB99 KNES   F,C
+#  Cloud Top Phase                 IXTD99 KNES   F,C,M
+#  Cloud Top Height                IXTG99 KNES   F,C,M
+#  Cloud Top Pressure              IXTX01 KNES   F,C
+#  Cloud Top Temperature           IXTI99 KNES   F,M
+#  Derived Stability Indices       IXTN99 KNES   F,C,M
+#  Total Precipitable Water        IXTO99 KNES   F,C,M
+#  Clear Sky Mask                  IXTH99 KNES   F,C,M
+#  Fire/Hot Spot Characterization  IXTJ99 KNES   F,C
+#  Land Surface (Skin) Temperature IXTK99 KNES   F,C,M
+#