diff --git a/.gitmodules b/.gitmodules
index a4e4d00c2..779a7faa7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,6 +77,10 @@
   path = sorc/fms
   url = https://github.com/jcsda/fms.git
   branch = release-stable
+[submodule "sorc/jcb"]
+  path = sorc/jcb
+  url = https://github.com/noaa-emc/jcb.git
+  branch = develop
 [submodule "parm/jcb-gdas"]
   path = parm/jcb-gdas
   url = https://github.com/noaa-emc/jcb-gdas
diff --git a/mains/gdas.cc b/mains/gdas.cc
old mode 100644
new mode 100755
index 7fdbee0b1..4a894b365
--- a/mains/gdas.cc
+++ b/mains/gdas.cc
@@ -14,6 +14,7 @@
 #include "ufo/instantiateObsFilterFactory.h"
 #include "ufo/ObsTraits.h"
 
+#include "oops/runs/ConvertToStructuredGrid.h"
 #include "oops/runs/ConvertState.h"
 #include "oops/runs/HofX4D.h"
 #include "oops/runs/LocalEnsembleDA.h"
@@ -52,6 +53,9 @@ int runApp(int argc, char** argv, const std::string traits, const std::string ap
   // Define a map from app names to lambda functions that create unique_ptr to Applications
   std::map<std::string, std::function<std::unique_ptr<oops::Application>()>> apps;
 
+  apps["converttostructuredgrid"] = []() {
+      return std::make_unique<oops::ConvertToStructuredGrid<Traits>>();
+  };	
   apps["convertstate"] = []() {
       return std::make_unique<oops::ConvertState<Traits>>();
   };
@@ -96,6 +100,7 @@ int main(int argc,  char ** argv) {
   // Check that the application is recognized
   // ----------------------------------------
   const std::set<std::string> validApps = {
+    "converttostructuredgrid",
     "convertstate",
     "hofx4d",
     "localensembleda",
diff --git a/parm/aero/obs/lists/gdas_aero.yaml.j2 b/parm/aero/obs/lists/gdas_aero.yaml.j2
index 238ba4856..ae3b89fe7 100644
--- a/parm/aero/obs/lists/gdas_aero.yaml.j2
+++ b/parm/aero/obs/lists/gdas_aero.yaml.j2
@@ -2,5 +2,4 @@ observers:
 {% filter indent(width=2) %}
 {% include 'aero/obs/config/viirs_n20_aod.yaml.j2' %}
 {% include 'aero/obs/config/viirs_npp_aod.yaml.j2' %}
-{% include 'aero/obs/config/viirs_n21_aod.yaml.j2' %}
 {% endfilter %}
diff --git a/sorc/gsibec b/sorc/gsibec
index e6e1944e1..c8ac58d9b 160000
--- a/sorc/gsibec
+++ b/sorc/gsibec
@@ -1 +1 @@
-Subproject commit e6e1944e1cb8f339b4eb79acffb5470bb7723b42
+Subproject commit c8ac58d9b43eb8f890e565d12c88f1b0579c9ccd
diff --git a/sorc/jcb b/sorc/jcb
new file mode 160000
index 000000000..faee9f4c0
--- /dev/null
+++ b/sorc/jcb
@@ -0,0 +1 @@
+Subproject commit faee9f4c029de3d9c9749ce5d12f4e97eb90c022