diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90
index 9a6a387ba..ed27c5e37 100644
--- a/ccpp/data/CCPP_typedefs.F90
+++ b/ccpp/data/CCPP_typedefs.F90
@@ -929,6 +929,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
     if (Model%imp_physics == Model%imp_physics_thompson) then
       if (Model%ltaerosol) then
         Interstitial%nvdiff = 12
+     else if (Model%mraerosol) then
+        Interstitial%nvdiff = 10
       else
         Interstitial%nvdiff = 9
       endif
@@ -1018,6 +1020,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
       elseif (Model%imp_physics == Model%imp_physics_thompson) then
         if (Model%ltaerosol) then
           Interstitial%nvdiff = 12
+        else if (Model%mraerosol) then
+          Interstitial%nvdiff = 10
         else
           Interstitial%nvdiff = 9
         endif
diff --git a/ccpp/physics b/ccpp/physics
index c83cd1714..61b419f13 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit c83cd1714c9674f87944a48d82c287ce1660d226
+Subproject commit 61b419f132ea24cbe191e34f1bbfcedf2c66e0dd