diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
index 5468863c7..a0721eef3 100644
--- a/ccpp/CMakeLists.txt
+++ b/ccpp/CMakeLists.txt
@@ -30,6 +30,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/physics)
 # Generate Compiler flags for C/CXX/Fortran - set to match NEMSfv3gfs flags
 # for DEBUG, REPRO and PROD mode for all three compilers
 
+# DH* 20210429 - quick workaround to get REPRO mode propagated
+# correctly to CCPP - will be cleaned up in Dusan's next PR
+if(REPRO)
+  set(CMAKE_BUILD_TYPE Bitforbit CACHE STRING "Choose the type of build." FORCE)
+endif()
+# *DH 20210429
+
 # Set basic compiler optimization levels, depending on build type
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
   ADD_DEFINITIONS(-DDEBUG)
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index efc4cb6ec..048d461d0 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -294,13 +294,6 @@
             # *DH 2020-06-01
             ],
         },
-    'mp_fer_hires' : {
-        'mp_fer_hires_init' : [
-            'fraction_of_ice_water_cloud',
-            'fraction_of_rain_water_cloud',
-            'rime_factor',
-            ],
-        },
     'rrtmgp_sw_rte' : {
          'rrtmgp_sw_rte_run' : [
              'components_of_surface_downward_shortwave_fluxes',
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index fcca8693b..cb7def297 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -7462,7 +7462,7 @@
   dimensions = (horizontal_loop_extent,vertical_dimension,number_of_3d_auxiliary_arrays)
   type = real
   kind = kind_phys
-  active = (number_of_2d_auxiliary_arrays > 0)
+  active = (number_of_3d_auxiliary_arrays > 0)
 
 ########################################################################
 [ccpp-table-properties]
diff --git a/ccpp/physics b/ccpp/physics
index 5015be490..6237270d1 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 5015be490d45efdc790caa49f0d9dc9e364dfe92
+Subproject commit 6237270d1a8fe79b22cedd364d9e5429e141bbef