diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index 83481397a..2ea9736df 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -1650,8 +1650,7 @@ module GFS_typedefs
     real (kind=kind_phys), pointer :: tdomzr (:)     => null()   !< dominant accumulated freezing rain type
     real (kind=kind_phys), pointer :: tdomip (:)     => null()   !< dominant accumulated sleet type
     real (kind=kind_phys), pointer :: tdoms  (:)     => null()   !< dominant accumulated snow type
-
-    real (kind=kind_phys), pointer :: zmtnblck(:)    => null()   !<mountain blocking evel
+    real (kind=kind_phys), pointer :: zmtnblck(:)    => null()   !<mountain blocking level
 
     ! dtend/dtidxt: Multitudinous 3d tendencies in a 4D array: (i,k,1:100+ntrac,nprocess)
     ! Sparse in outermost two dimensions. dtidx(1:100+ntrac,nprocess) maps to dtend 
@@ -6779,6 +6778,7 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
     Diag%tdomzr     = zero
     Diag%tdomip     = zero
     Diag%tdoms      = zero
+    Diag%zmtnblck   = zero
 
     if(Model%lsm == Model%lsm_noahmp)then
       Diag%paha       = zero
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index 0b8557bdf..84b933a01 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -5058,7 +5058,7 @@
   dimensions = ()
   type = integer
 [ncnvwind]
-  standard_name = index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convectionin_in_xy_dimensioned_restart_array
+  standard_name = index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convection_in_xy_dimensioned_restart_array
   long_name = the index of surface wind enhancement due to convection in phy f2d
   units =
   dimensions = ()
@@ -5900,14 +5900,14 @@
   type = real
   kind = kind_phys
   active = (index_of_surface_air_pressure_on_previous_timestep_in_xyz_dimensioned_restart_array > 0)
-[phy_f2d(:,index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convectionin_in_xy_dimensioned_restart_array)]
+[phy_f2d(:,index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convection_in_xy_dimensioned_restart_array)]
   standard_name = enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convection
   long_name = surface wind enhancement due to convection
   units = m s-1
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convectionin_in_xy_dimensioned_restart_array > 0)
+  active = (index_of_enhancement_to_wind_speed_at_surface_adjacent_layer_due_to_convection_in_xy_dimensioned_restart_array > 0)
 [phy_f3d(:,:,index_of_air_temperature_two_timesteps_back_in_xyz_dimensioned_restart_array)]
   standard_name = air_temperature_two_timesteps_back
   long_name = air temperature two timesteps back
diff --git a/ccpp/driver/GFS_restart.F90 b/ccpp/driver/GFS_restart.F90
index e4c4061f1..235f3de82 100644
--- a/ccpp/driver/GFS_restart.F90
+++ b/ccpp/driver/GFS_restart.F90
@@ -115,7 +115,7 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, &
     endif
     ! MYNN SFC
     if (Model%do_mynnsfclay) then
-      Restart%num2d = Restart%num2d + 1
+      Restart%num2d = Restart%num2d + 13
     endif
     ! Thompson aerosol-aware
     if (Model%imp_physics == Model%imp_physics_thompson .and. Model%ltaerosol) then
@@ -130,7 +130,7 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, &
     if (Model%imfdeepcnv == 3) then
       Restart%num3d = Restart%num3d + 3
     endif
-    ! MYNN PBL 
+    ! MYNN PBL
     if (Model%do_mynnedmf) then
       Restart%num3d = Restart%num3d + 9
     endif
@@ -305,6 +305,66 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, &
         do nb = 1,nblks
           Restart%data(nb,num)%var2p => Sfcprop(nb)%uustar(:)
         enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_hpbl'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Tbd(nb)%hpbl(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_ustm'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%ustm(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_zol'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%zol(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_mol'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%mol(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_flhc'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%flhc(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_flqc'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%flqc(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_chs2'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%chs2(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_cqs2'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%cqs2(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_lh'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%lh(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_hflx'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%hflx(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_evap'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%evap(:)
+        enddo
+        num = num + 1
+        Restart%name2d(num) = 'mynn_2d_qss'
+        do nb = 1,nblks
+          Restart%data(nb,num)%var2p => Sfcprop(nb)%qss(:)
+        enddo
     endif
     ! Thompson aerosol-aware
     if (Model%imp_physics == Model%imp_physics_thompson .and. Model%ltaerosol) then
diff --git a/ccpp/physics b/ccpp/physics
index a5dcdceda..9880f4407 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit a5dcdceda45f95d1e74880f67a0929e9d2464068
+Subproject commit 9880f4407c9132a61dd11741c6a114ae295d8fba
diff --git a/ccpp/suites/suite_FV3_GFS_v16_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v16_coupled_p8.xml
new file mode 100644
index 000000000..423d37f6d
--- /dev/null
+++ b/ccpp/suites/suite_FV3_GFS_v16_coupled_p8.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_v16_coupled_p8" version="1">
+  <!-- <init></init> -->
+  <group name="fast_physics">
+    <subcycle loop="1">
+      <scheme>fv_sat_adj</scheme>
+    </subcycle>
+  </group>
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>GFS_radiation_surface</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_nst_pre</scheme>
+      <scheme>sfc_nst</scheme>
+      <scheme>sfc_nst_post</scheme>
+      <scheme>noahmpdrv</scheme>
+      <scheme>sfc_cice</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>satmedmfvdifq</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>ugwpv1_gsldrag</scheme>
+      <scheme>ugwpv1_gsldrag_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>gfdl_cloud_microphys</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+      <scheme>phys_tend</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v16_p8.xml b/ccpp/suites/suite_FV3_GFS_v16_p8.xml
index ef860e66d..8828f503a 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_p8.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_p8.xml
@@ -10,7 +10,7 @@
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmgp_setup</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
       <scheme>GFS_rad_time_vary</scheme>
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
@@ -18,25 +18,15 @@
   <group name="radiation">
     <subcycle loop="1">
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmgp_pre</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
-      <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
-      <scheme>GFS_cloud_diagnostics</scheme>
-      <scheme>GFS_rrtmgp_sw_pre</scheme>
-      <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
-      <scheme>rrtmgp_sw_cloud_optics</scheme>
-      <scheme>rrtmgp_sw_cloud_sampling</scheme>
-      <scheme>rrtmgp_sw_rte</scheme>
-      <scheme>GFS_rrtmgp_sw_post</scheme>
-      <scheme>rrtmgp_lw_pre</scheme>
-      <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
-      <scheme>rrtmgp_lw_cloud_optics</scheme>
-      <scheme>rrtmgp_lw_cloud_sampling</scheme>
-      <scheme>rrtmgp_lw_rte</scheme>
-      <scheme>GFS_rrtmgp_lw_post</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
     </subcycle>
   </group>
   <group name="physics">