diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 633bbbd0f..c6774887e 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -7,7 +7,7 @@ set(abs_top_srcdir "${CMAKE_SOURCE_DIR}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 
 # Build documentation with target all.
-add_custom_target(doc ALL
+add_custom_target(upp_doc ALL
   ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMENT "Generating API Documentation with Doxygen" VERBATIM)
diff --git a/parm/nam_cntrl_cmaq.xml b/parm/nam_cntrl_cmaq.xml
index ba4fd3ef3..32ba724a4 100644
--- a/parm/nam_cntrl_cmaq.xml
+++ b/parm/nam_cntrl_cmaq.xml
@@ -451,7 +451,7 @@
 
        <param>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</pname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
@@ -2282,7 +2282,7 @@
 
        <param>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</pname>
        <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
        <level>0.</level>
        <scale_fact_fixed_sfc2>2</scale_fact_fixed_sfc2>
@@ -3793,7 +3793,7 @@
 
        <param>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</pname>
        <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/nam_post_avblflds.xml b/parm/nam_post_avblflds.xml
index 9aeabac16..1601ce92b 100644
--- a/parm/nam_post_avblflds.xml
+++ b/parm/nam_post_avblflds.xml
@@ -297,7 +297,7 @@
     <param>
       <post_avblfldidx>36</post_avblfldidx>
       <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-      <pname>SOILM</pname>
+      <pname>SOILMOI</pname>
       <fixed_sfc1_type>depth_bel_land_sfc</fixed_sfc1_type>
       <scale_fact_fixed_sfc1>2</scale_fact_fixed_sfc1>
       <fixed_sfc2_type>depth_bel_land_sfc</fixed_sfc2_type>
diff --git a/parm/ngac_post_avblflds.xml b/parm/ngac_post_avblflds.xml
index 6c1e3e42f..49057cdfe 100644
--- a/parm/ngac_post_avblflds.xml
+++ b/parm/ngac_post_avblflds.xml
@@ -299,7 +299,7 @@
     <param>
        <post_avblfldidx>36</post_avblfldidx>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</pname>
        <fixed_sfc1_type>depth_bel_land_sfc</fixed_sfc1_type>
        <scale>3.0</scale>
     </param>
diff --git a/parm/params_grib2_tbl_new b/parm/params_grib2_tbl_new
index 37456c561..c3cdd17de 100755
--- a/parm/params_grib2_tbl_new
+++ b/parm/params_grib2_tbl_new
@@ -937,7 +937,6 @@
    2   3     5   0 SOILL
    2   3   192   1 SOILL
    2   3    19   0 SOILMOI
-   2   0    22   0 SOILM
    2   3    15   0 SOILP
    2   0   239   1 SOILSE
    2   3    18   0 SOILTMP
diff --git a/parm/params_grib2_tbl_new.text b/parm/params_grib2_tbl_new.text
index ece81833e..5059b025c 100755
--- a/parm/params_grib2_tbl_new.text
+++ b/parm/params_grib2_tbl_new.text
@@ -97,7 +97,7 @@
    0   1    19   0 PTYPE
    0   1    20   0 ILIQW
    0   1    21   0 TCOND
-!  Changed from CLWMR to CLWR 
+!  Changed from CLWMR to CLWR
 ! (WGRIB2 v2.0.8 updated) in 4/6/2021
    0   1    22   0 CLMR
    0   1    23   0 ICMR
@@ -955,6 +955,7 @@
    2   0     0   0 LAND
    2   0     1   0 SFCR
    2   0     2   0 TSOIL
+!  Parameter SOILM deprecated 12/03/2021
 !   2   0     3   0 SOILM
    2   0     4   0 VEG
    2   0     5   0 WATR
@@ -975,7 +976,8 @@
    2   0    19   0 RCT
    2   0    20   0 RCSOL
    2   0    21   0 RCQ
-   2   0    22   0 SOILM
+!  Parameter SOILD deprecated 12/03/2021
+!   2   0    22   0 SOILM
    2   0    23   0 CISOILW
    2   0    24   0 HFLUX
    2   0    25   0 VSOILM
diff --git a/parm/post_avblflds.xml b/parm/post_avblflds.xml
index f053f4161..974f6ce1e 100755
--- a/parm/post_avblflds.xml
+++ b/parm/post_avblflds.xml
@@ -297,7 +297,7 @@
     <param>
        <post_avblfldidx>36</post_avblfldidx>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</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/post_avblflds_raphrrr.xml b/parm/post_avblflds_raphrrr.xml
index 617a51557..65895a026 100755
--- a/parm/post_avblflds_raphrrr.xml
+++ b/parm/post_avblflds_raphrrr.xml
@@ -311,7 +311,7 @@
     <param>
        <post_avblfldidx>36</post_avblfldidx>
        <shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
-       <pname>SOILM</pname>
+       <pname>SOILMOI</pname>
        <fixed_sfc1_type>depth_bel_land_sfc</fixed_sfc1_type>
        <scale>3.0</scale>
     </param>
diff --git a/parm/postxconfig-NT-GFS-F00-TWO.txt b/parm/postxconfig-NT-GFS-F00-TWO.txt
index 229c1f52e..de64c9545 100644
--- a/parm/postxconfig-NT-GFS-F00-TWO.txt
+++ b/parm/postxconfig-NT-GFS-F00-TWO.txt
@@ -7475,7 +7475,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-FLUX-F00.txt b/parm/postxconfig-NT-GFS-FLUX-F00.txt
index 26b7058c8..8ba557348 100644
--- a/parm/postxconfig-NT-GFS-FLUX-F00.txt
+++ b/parm/postxconfig-NT-GFS-FLUX-F00.txt
@@ -1686,7 +1686,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-FLUX.txt b/parm/postxconfig-NT-GFS-FLUX.txt
index d5f224d47..8af5fed45 100644
--- a/parm/postxconfig-NT-GFS-FLUX.txt
+++ b/parm/postxconfig-NT-GFS-FLUX.txt
@@ -3832,7 +3832,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-GFS-TWO.txt b/parm/postxconfig-NT-GFS-TWO.txt
index ba22c218f..a417134f4 100644
--- a/parm/postxconfig-NT-GFS-TWO.txt
+++ b/parm/postxconfig-NT-GFS-TWO.txt
@@ -11619,7 +11619,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-NMM.txt b/parm/postxconfig-NT-NMM.txt
index 002bbcae0..5ebaf3085 100644
--- a/parm/postxconfig-NT-NMM.txt
+++ b/parm/postxconfig-NT-NMM.txt
@@ -2169,7 +2169,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
@@ -11916,7 +11916,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
@@ -19850,7 +19850,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/parm/postxconfig-NT-rap.txt b/parm/postxconfig-NT-rap.txt
index c76b78397..c8f5d97eb 100644
--- a/parm/postxconfig-NT-rap.txt
+++ b/parm/postxconfig-NT-rap.txt
@@ -577,7 +577,7 @@ SOILM_ON_DEPTH_BEL_LAND_SFC
 ?
 1
 tmpl4_0
-SOILM
+SOILMOI
 ?
 ?
 depth_bel_land_sfc
diff --git a/sorc/libIFI.fd b/sorc/libIFI.fd
index df7b97c40..1ba827087 160000
--- a/sorc/libIFI.fd
+++ b/sorc/libIFI.fd
@@ -1 +1 @@
-Subproject commit df7b97c407b651dfb9454554efbe6c22cebb6f37
+Subproject commit 1ba8270870947b583cd51bc72ff8960f4c1fb36e
diff --git a/sorc/ncep_post.fd/MDLFLD.f b/sorc/ncep_post.fd/MDLFLD.f
index cf9a824b2..5808c0bc3 100644
--- a/sorc/ncep_post.fd/MDLFLD.f
+++ b/sorc/ncep_post.fd/MDLFLD.f
@@ -588,7 +588,7 @@ SUBROUTINE MDLFLD
 
       ELSE IF(((MODELNAME == 'NMM' .and. GRIDTYPE=='B') .OR. MODELNAME == 'FV3R' &
         .OR. MODELNAME == 'GFS') &
-        .and. imp_physics==8)THEN !NMMB or FV3R or GFS +THOMPSON
+        .and. (imp_physics==8 .or. imp_physics==17 .or. imp_physics==18))THEN !NMMB or FV3R or GFS +THOMPSON
        DO L=1,LM
         DO J=JSTA,JEND
          DO I=ista,iend
diff --git a/tests/compile_upp.sh b/tests/compile_upp.sh
index 078a63b8c..2ecfe9f5e 100755
--- a/tests/compile_upp.sh
+++ b/tests/compile_upp.sh
@@ -61,6 +61,14 @@ while getopts ":p:gwc:vhiId" opt; do
       ;;
   esac
 done
+
+if [[ ! -z $debug_opt && $ifi_opt =~ INTERNAL.*=ON ]] ; then
+    echo ENABLING IFI DEBUG
+    # When building debug mode with internal IFI, also enable debugging in IFI.
+    # This includes bounds checking in much of the libIFI C++ library.
+    debug_opt="$debug_opt -DIFI_DEBUG=ON"
+fi
+
 cmake_opts=" -DCMAKE_INSTALL_PREFIX=$prefix"${wrfio_opt}${gtg_opt}${ifi_opt}${debug_opt}
 
 if [[ $(uname -s) == Darwin ]]; then
@@ -112,6 +120,7 @@ if [[ $MACHINE_ID != "unknown" ]]; then
    module list
 fi
 
+set -x
 BUILD_DIR=${BUILD_DIR:-"build"}
 rm -rf ${BUILD_DIR} install
 mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}