diff --git a/parm/post_avblflds.xml b/parm/post_avblflds.xml
index 79f8c7da9..ebe73f227 100755
--- a/parm/post_avblflds.xml
+++ b/parm/post_avblflds.xml
@@ -296,8 +296,8 @@
 
     <param>
        <post_avblfldidx>36</post_avblfldidx>
-       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILMOI</pname>
+       <shortname>GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
+       <pname>CISOILM</pname>
        <fixed_sfc1_type>depth_bel_land_sfc</fixed_sfc1_type>
        <fixed_sfc2_type>depth_bel_land_sfc</fixed_sfc2_type>
        <scale>3.0</scale>
diff --git a/parm/postcntrl_gfs_f00_two.xml b/parm/postcntrl_gfs_f00_two.xml
index a26541def..97526704f 100755
--- a/parm/postcntrl_gfs_f00_two.xml
+++ b/parm/postcntrl_gfs_f00_two.xml
@@ -1211,7 +1211,7 @@
     </param>
 
     <param>
-       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
+       <shortname>GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
diff --git a/parm/postcntrl_gfs_flux.xml b/parm/postcntrl_gfs_flux.xml
index 2511c3e48..51aa5c9a1 100755
--- a/parm/postcntrl_gfs_flux.xml
+++ b/parm/postcntrl_gfs_flux.xml
@@ -605,7 +605,7 @@
     </param>
 
     <param>
-       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
+       <shortname>GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
diff --git a/parm/postcntrl_gfs_flux_f00.xml b/parm/postcntrl_gfs_flux_f00.xml
index c8c6c1008..3e5c8c245 100755
--- a/parm/postcntrl_gfs_flux_f00.xml
+++ b/parm/postcntrl_gfs_flux_f00.xml
@@ -283,7 +283,7 @@
     </param>
 
     <param>
-       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
+       <shortname>GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
diff --git a/parm/postcntrl_gfs_two.xml b/parm/postcntrl_gfs_two.xml
index 244cc0c39..4b5c8b806 100755
--- a/parm/postcntrl_gfs_two.xml
+++ b/parm/postcntrl_gfs_two.xml
@@ -1796,7 +1796,7 @@
     </param>
 
     <param>
-       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
+       <shortname>GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
diff --git a/parm/postxconfig-NT-GFS-F00-TWO.txt b/parm/postxconfig-NT-GFS-F00-TWO.txt
index a0f6f3346..1757a50c1 100644
--- a/parm/postxconfig-NT-GFS-F00-TWO.txt
+++ b/parm/postxconfig-NT-GFS-F00-TWO.txt
@@ -7397,11 +7397,11 @@ hybrid_lvl
 ?
 ?
 36
-SOILM_ON_DEPTH_BEL_LAND_SFC
+GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILMOI
+CISOILM
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-FLUX-F00.txt b/parm/postxconfig-NT-GFS-FLUX-F00.txt
index 8ba557348..e4b856dae 100644
--- a/parm/postxconfig-NT-GFS-FLUX-F00.txt
+++ b/parm/postxconfig-NT-GFS-FLUX-F00.txt
@@ -1682,11 +1682,11 @@ hybrid_lvl
 ?
 ?
 36
-SOILM_ON_DEPTH_BEL_LAND_SFC
+GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILMOI
+CISOILM
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-FLUX.txt b/parm/postxconfig-NT-GFS-FLUX.txt
index 8af5fed45..081a54c2c 100644
--- a/parm/postxconfig-NT-GFS-FLUX.txt
+++ b/parm/postxconfig-NT-GFS-FLUX.txt
@@ -3828,11 +3828,11 @@ surface
 ?
 ?
 36
-SOILM_ON_DEPTH_BEL_LAND_SFC
+GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILMOI
+CISOILM
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-TWO.txt b/parm/postxconfig-NT-GFS-TWO.txt
index 595eed01d..b6484bc1a 100644
--- a/parm/postxconfig-NT-GFS-TWO.txt
+++ b/parm/postxconfig-NT-GFS-TWO.txt
@@ -11393,11 +11393,11 @@ surface
 ?
 ?
 36
-SOILM_ON_DEPTH_BEL_LAND_SFC
+GFS_CISOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILMOI
+CISOILM
 ?
 ?
 depth_bel_land_sfc
diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt
index e439d125c..3dbcc79ce 100644
--- a/sorc/ncep_post.fd/CMakeLists.txt
+++ b/sorc/ncep_post.fd/CMakeLists.txt
@@ -179,7 +179,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS
       "-g -traceback -fp-model source -free -convert big_endian")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -ftrapuv -check all")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -ftrapuv -check all -check noarg_temp_created")
   set_source_files_properties(INITPOST_GFS_NEMS_MPIIO.f INITPOST_NETCDF.f INITPOST_NEMS.f PROPERTIES COMPILE_FLAGS -qoverride-limits)
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
   set(CMAKE_Fortran_FLAGS