diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
index 760e09a8e..b1fc8ed42 100644
--- a/ccpp/CMakeLists.txt
+++ b/ccpp/CMakeLists.txt
@@ -109,7 +109,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftrapuv -traceback")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrapuv -traceback")
     set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check")
-    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fstack-protector-all -fpe0 -traceback -debug -ftrapuv")
+    set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -fstack-protector-all -fpe0 -traceback -debug -ftrapuv -init=snan,arrays")
   elseif (${CMAKE_BUILD_TYPE} MATCHES "Bitforbit")
     if(LEGACY_INTEL)
       set (CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model strict -qoverride-limits -traceback")
diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index f91fdc06f..82fbed80f 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -686,6 +686,11 @@ module GFS_typedefs
 
 !--- microphysical switch
     integer              :: ncld                           !< choice of cloud scheme
+    logical              :: convert_dry_rho = .false.      !< flag for converting number concentrations from moist to dry
+                                                           !< this flag will no longer be needed once the CCPP standard
+                                                           !< names and the CCPP framework logic have been augmented to
+                                                           !< automatically determine whether such conversions are necessary
+                                                           !< and if yes, perform them; hardcoded to .false. for now
     !--- new microphysical switch
     integer              :: imp_physics                    !< choice of microphysics scheme
     integer              :: imp_physics_gfdl = 11          !< choice of GFDL     microphysics scheme
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index f39248d4c..c039c0a38 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -2806,6 +2806,12 @@
   units = count
   dimensions = ()
   type = integer
+[convert_dry_rho]
+  standard_name = flag_for_converting_hydrometeors_from_moist_to_dry_air
+  long_name = flag for converting hydrometeors from moist to dry air
+  units = flag
+  dimensions = ()
+  type = logical
 [imp_physics]
   standard_name = flag_for_microphysics_scheme
   long_name = choice of microphysics scheme
diff --git a/ccpp/physics b/ccpp/physics
index c82e50126..8507df659 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit c82e50126dbb2cd63b866411f3aca76e39da0eb2
+Subproject commit 8507df659d7d37bae5a697d684b8046f19e2f36b