diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 9f4ea4b748..1bdbb9ee22 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -77,4 +77,7 @@ ac03492012837799b7111607188acff9f739044a
 d858665d799690d73b56bcb961684382551193f4
 c0c6da391ee359f2765439426f3a2a4593a95343
 598de2f05638286b3d99ac0ed120977cbc554c3d
+5bf360747080a1498664b6f0fd62d3d19838045b
+3c6a4254a539c2b9cfdced8f796d8ffc85096b02
+c4f81babe0aaa26250cca92de8118331e5676fdf
 5e7346ad28be374735ff9200861d9526d3dbbf53
diff --git a/.gitmodules b/.gitmodules
index e1e534712e..52f1f22dff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -75,24 +75,33 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
 [submodule "cime"]
 path = cime
-url = https://github.com/ESMCI/cime
-fxtag = cime6.5.5
+#url = https://github.com/ESMCI/cime
+url = https://github.com/ekluzek/cime
+#fxtag = cime6.5.5
+#branch = add_coupling_mode_to_attributes_for_config_component
+fxtag = a286fa7b558821867efb15adaec013b14d99e939
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime
 
 [submodule "cmeps"]
 path = components/cmeps
-url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.1.64
+#url = https://github.com/ESCOMP/CMEPS.git
+url = https://github.com/ekluzek/CMEPS.git
+#fxtag = cmeps1.1.64
+#branch = co2a_for_cplhist
+fxtag = 6789df17d7f7f1615aca383a41187ff48c4b85c9
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
-url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.105
+#url = https://github.com/ESCOMP/CDEPS.git
+url = https://github.com/ekluzek/CDEPS.git
+#fxtag = cdeps1.0.105
+#branch = 1850_aero_ndep_ozone
+fxtag = 4a6f49ceb275512dac3adaa5176e957c1c4cad42
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
diff --git a/cime b/cime
index 92ae0fd813..a286fa7b55 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit 92ae0fd8133a3397a95f1cfcfa40dc138562f305
+Subproject commit a286fa7b558821867efb15adaec013b14d99e939
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index d0cca1a0b3..de8008308c 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -273,6 +273,7 @@ Caveats:
       <value compset="_BGC%BDRD"   >diagnostic</value>
       <value compset="_BGC%BPRP"   >prognostic</value>
       <value compset="HIST.*_DATM" >diagnostic</value>
+      <value compset="1850.*_DATM%CPLHIST" >diagnostic</value>
       <value compset="SSP.*_DATM"  >diagnostic</value>
     </values>
     <group>run_component_ctsm</group>
@@ -307,6 +308,8 @@ Caveats:
     <default_value>FALSE</default_value>
     <values>
       <value compset="_CAM" >TRUE</value>
+      <value compset="_DATM%CPLHIST" >TRUE</value>
+      <value compset="1850_.*CLM60" >TRUE</value>
     </values>
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index a5a19b0b92..4eeb2dc1df 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -2800,7 +2800,7 @@
       <option name="comment">Simple test to make sure the basic FatesSp compset works"</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm60BgcCropSpinup" testmods="clm/cplhist">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm60BgcCropSpinup" testmods="clm/crop">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2810,7 +2810,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist--clm/matrixcnOn">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
deleted file mode 100644
index fe0e18cf88..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
+++ /dev/null
@@ -1 +0,0 @@
-../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
deleted file mode 100755
index f0eb85010b..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
+++ /dev/null
@@ -1,8 +0,0 @@
-./xmlchange DATM_CPLHIST_CASE=cam6ctsm51_cesm23a12c_ne30pg3g17_CPLHIST_1850
-./xmlchange DATM_CPLHIST_DIR='$DIN_LOC_ROOT/atm/datm7/atm_forcing.cdeps_datm.CPLHIST_cam6ctsm51_cesm23a12c_ne30pg3g17_1850'
-./xmlchange DATM_YR_START=1
-./xmlchange DATM_YR_END=1
-./xmlchange DATM_YR_ALIGN=1
-
-# Needed until we have cplhist forcing with ndep - see https://github.com/escomp/ctsm/issues/1844
-./xmlchange DATM_PRESNDEP=none
diff --git a/components/cdeps b/components/cdeps
index af8c89fc02..4a6f49ceb2 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit af8c89fc027898ed4876ecec0b0f260661265ca6
+Subproject commit 4a6f49ceb275512dac3adaa5176e957c1c4cad42
diff --git a/components/cmeps b/components/cmeps
index 2d9b7d25ec..6789df17d7 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 2d9b7d25ec415a43548ca212ec87e9f601e48ff4
+Subproject commit 6789df17d7f7f1615aca383a41187ff48c4b85c9