diff --git a/FV3 b/FV3
index e7fe5faa24..5ed88a715e 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit e7fe5faa24447f2fd4c9557cea0690818f097a6c
+Subproject commit 5ed88a715eb19ff596533934508dcb74b0d880fb
diff --git a/build.sh b/build.sh
index 85e9547815..c146c00f64 100755
--- a/build.sh
+++ b/build.sh
@@ -3,8 +3,7 @@ set -eu
 
 MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
 
-export COMPILER=${COMPILER:?"Please set COMPILER environment variable [gnu|intel]"}
-export CMAKE_Platform=linux.${COMPILER}
+export CMAKE_Platform=${CMAKE_Platform:?"Please set the CMAKE_Platform environment variable, e.g. [macosx.gnu|linux.gnu|linux.intel|hera.intel|...]"}
 export CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-mpicc}
 export CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-mpicxx}
 export CMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER:-mpif90}
diff --git a/cmake/configure_jet.intel.cmake b/cmake/configure_jet.intel.cmake
index 846fa0c7d3..4caba51b5b 100644
--- a/cmake/configure_jet.intel.cmake
+++ b/cmake/configure_jet.intel.cmake
@@ -21,9 +21,11 @@ option(INLINE_POST "Enable inline post" OFF)
 
 include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )
 
-message("AVX2 is   ENABLED on Jet (multi-tagret executable)")
+message("AVX2 is   ENABLED on Jet (multi-target executable)")
 string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
 string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+# For CCPP
+option(SIMDMULTIARCH "Enable multi-target SIMD instruction sets" ON)
 
 string(REPLACE "-i_dynamic" "-shared-intel"
        CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS
diff --git a/parm/ccpp_gsd_sar_v1.nml.IN b/parm/ccpp_gsd_sar_v1.nml.IN
index 5494d40b5e..7085b805a1 100644
--- a/parm/ccpp_gsd_sar_v1.nml.IN
+++ b/parm/ccpp_gsd_sar_v1.nml.IN
@@ -175,8 +175,8 @@
        random_clds    = .false.
        trans_trac     = .true.
        cnvcld         = .false.
-       imfshalcnv     = 0
-       imfdeepcnv     = 0
+       imfshalcnv     = -1
+       imfdeepcnv     = -1
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
        ivegsrc        = 1
@@ -193,7 +193,7 @@
        do_shum        = .F.
        do_skeb        = .F.
        do_sfcperts    = .F.
-       lsm            = 2
+       lsm            = 1
        lsoil          = 4
        iopt_dveg      = 2
        iopt_crs       = 1
diff --git a/tests/tests/fv3_ccpp_gsd_sar_v1 b/tests/tests/fv3_ccpp_gsd_sar_v1
index d9eced9747..f38e11df0e 100644
--- a/tests/tests/fv3_ccpp_gsd_sar_v1
+++ b/tests/tests/fv3_ccpp_gsd_sar_v1
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-#  FV3 CCPP GSD SAR (GF CU + Thompson MP + MYNN PBL + RUC LSM) test
+#  FV3 CCPP GSD SAR ( Thompson MP + MYNN PBL + NOAH LSM) test
 #
 ###############################################################################
 
diff --git a/tests/tests/fv3_ccpp_rrfs_v0 b/tests/tests/fv3_ccpp_rrfs_v0
index 05a0a3e93d..b282981303 100644
--- a/tests/tests/fv3_ccpp_rrfs_v0
+++ b/tests/tests/fv3_ccpp_rrfs_v0
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-#  FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) test
+#  FV3 CCPP RRFS (Thompson MP + MYNN PBL + NOAHMP LSM) test
 #
 ###############################################################################
 
@@ -115,8 +115,8 @@ export INPUT_NML=ccpp_gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
-export IMFSHALCNV=3
-export IMFDEEPCNV=3
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
 export FHCYC=0
 export LSM=2
 export LSOIL_LSM=4