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..632843af80 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -83,16 +83,22 @@ 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.65
+#branch = co2a_for_cplhist
+fxtag = 2b7c96f473c41a22a3f605eef575b18f6de483b6
 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.106
+#branch = 1850_aero_ndep_ozone
+fxtag = d58728e439f2be39b731bba19d104b97b9506d6c
 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_config/config_component.xml b/cime_config/config_component.xml
index d0cca1a0b3..c38227fbed 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -78,37 +78,37 @@
     <values match="last">
       <!-- Options for atm forcing are: CRUJRA2024, CRUJRA2024b, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), cam5.0, cam4.0, QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
       <!-- All the clm5_0 physics options -->
-      <value compset="DATM%CRUJRA2024[b]*_CLM50">clm5_0_CRUJRA2024</value>
-      <value compset="DATM%CRUv7_CLM50"  >clm5_0_CRUv7</value>
+      <value compset="DATM%CRUJRA2024[b]*[^_]*_CLM50">clm5_0_CRUJRA2024</value>
+      <value compset="DATM%CRUv7[^_]*_CLM50"  >clm5_0_CRUv7</value>
       <value compset="SATM_CLM50"        >clm5_0_GSWP3v1</value>
-      <value compset="DATM%GSWP3v1_CLM50">clm5_0_GSWP3v1</value>
+      <value compset="DATM%GSWP3v1[^_]*_CLM50">clm5_0_GSWP3v1</value>
       <value compset="CAM[^_]+_CLM50"    >clm5_0_cam6.0</value>
       <value compset="CAM40[^_]*_CLM50"  >clm5_0_cam4.0</value>
       <value compset="CAM50[^_]*_CLM50"  >clm5_0_cam5.0</value>
       <value compset="CAM60[^_]*_CLM50"  >clm5_0_cam6.0</value>
       <value compset="CAM70[^_]*_CLM50"  >clm5_0_cam7.0</value>
-      <value compset="DATM%CPLHIST_CLM50">clm5_0_cam6.0</value>
-      <value compset="DATM%QIA_CLM50"    >clm5_0_QIAN</value>
-      <value compset="DATM%WISOQIA_CLM50">clm5_0_QIAN</value>
-      <value compset="DATM%1PT_CLM50"    >clm5_0_1PT</value>
-      <value compset="DATM%NLDAS2_CLM50" >clm5_0_NLDAS2</value>
-      <value compset="DATM%ERA5_CLM50"   >clm5_0_ERA5</value>
+      <value compset="DATM%CPLHIST[^_]*_CLM50">clm5_0_cam6.0</value>
+      <value compset="DATM%QIA[^_]*_CLM50"    >clm5_0_QIAN</value>
+      <value compset="DATM%WISOQIA[^_]*_CLM50">clm5_0_QIAN</value>
+      <value compset="DATM%1PT[^_]*_CLM50"    >clm5_0_1PT</value>
+      <value compset="DATM%NLDAS2[^_]*_CLM50" >clm5_0_NLDAS2</value>
+      <value compset="DATM%ERA5[^_]*_CLM50"   >clm5_0_ERA5</value>
       <!-- All the clm6_0 physics options -->
-      <value compset="DATM%CRUJRA2024[b]*_CLM60">clm6_0_CRUJRA2024</value>
-      <value compset="DATM%CRUv7_CLM60"  >clm6_0_CRUv7</value>
+      <value compset="DATM%CRUJRA2024[b]*[^_]*_CLM60">clm6_0_CRUJRA2024</value>
+      <value compset="DATM%CRUv7[^_]*_CLM60"  >clm6_0_CRUv7</value>
       <value compset="SATM_CLM60"        >clm6_0_GSWP3v1</value>
-      <value compset="DATM%GSWP3v1_CLM60">clm6_0_GSWP3v1</value>
+      <value compset="DATM%GSWP3v1[^_]*_CLM60">clm6_0_GSWP3v1</value>
       <value compset="CAM[^_]+_CLM60"    >clm6_0_cam6.0</value>
       <value compset="CAM40[^_]*_CLM60"  >clm6_0_cam4.0</value>
       <value compset="CAM50[^_]*_CLM60"  >clm6_0_cam5.0</value>
       <value compset="CAM60[^_]*_CLM60"  >clm6_0_cam6.0</value>
       <value compset="CAM70[^_]*_CLM60"  >clm6_0_cam7.0</value>
-      <value compset="DATM%CPLHIST_CLM60">clm6_0_cam7.0</value>
-      <value compset="DATM%QIA_CLM60"    >clm6_0_QIAN</value>
-      <value compset="DATM%WISOQIA_CLM60">clm6_0_QIAN</value>
-      <value compset="DATM%1PT_CLM60"    >clm6_0_1PT</value>
-      <value compset="DATM%NLDAS2_CLM60" >clm6_0_NLDAS2</value>
-      <value compset="DATM%ERA5_CLM60"   >clm6_0_ERA5</value>
+      <value compset="DATM%CPLHIST[^_]*_CLM60">clm6_0_cam7.0</value>
+      <value compset="DATM%QIA[^_]*_CLM60"    >clm6_0_QIAN</value>
+      <value compset="DATM%WISOQIA[^_]*_CLM60">clm6_0_QIAN</value>
+      <value compset="DATM%1PT[^_]*_CLM60"    >clm6_0_1PT</value>
+      <value compset="DATM%NLDAS2[^_]*_CLM60" >clm6_0_NLDAS2</value>
+      <value compset="DATM%ERA5[^_]*_CLM60"   >clm6_0_ERA5</value>
       <!-- Invalid ocean DATM forcing options -->
       <value compset="DATM%NYF"          >INVALID_DATM_FORCING_FOR_RUNNING_CTSM</value>
       <value compset="DATM%MOSARTTEST"   >INVALID_DATM_FORCING_FOR_RUNNING_CTSM</value>
@@ -148,11 +148,10 @@
     <desc>Whether to use CMIP6 or CMIP7 fsurdat/landuse files.
     As of ctsm5.4 we do not have CMIP7 PFT raw datasets for SSPs, so default to CMIP6 for these. For other compsets default to CMIP7. User may modify to a non-default value in env_run.xml.
 Caveats:
-1) We supply only CMIP7 C13/C14 isotope datasets, so these get used regardless.
-2) We supply only CMIP7 population density with ctsm6 in non-SSP cases, because the fire model is calibrated to that; conversely, for pre-ctsm6 and for SSP we supply only CMIP6 population density.
-3) We supply only CMIP6 nitrogen deposition (ndep), so this gets used regardless.
-4) For DATM we supply only CMIP6 aerosols.
-5) For DATM we supply only CMIP6 CO2</desc>
+1) We supply only CMIP7 population density with all clm physics versions in non-SSP cases, because the fire model is calibrated to that; conversely, for clm5_0 physics and for SSP cases we supply only CMIP6 population density.
+2) We supply only CMIP6 nitrogen deposition (ndep) from CLM, but 1850 or CPLHIST cases with CLM60 physics default to use the cesm3 CMIP7 version from DATM (use DATM_PRESNDEP and CLM_NDEP_FROM_CPL to change it).
+3) For DATM we default to CMIP6 aerosols (use DATM_CO2_TSERIES to change it).
+4) For DATM we default to CMIP6 CO2 (use DATM_CO2_TSERIES to change it).</desc>
   </entry>
 
   <entry id="LND_SETS_DUST_EMIS_DRV_FLDS">
@@ -273,6 +272,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 +307,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/config_compsets.xml b/cime_config/config_compsets.xml
index a49f2a46b9..0b3244648d 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -200,11 +200,11 @@
   <!-- currently needed for CESM remove when no longer needed -->
   <compset>
     <alias>I1850Clm60BgcCrop</alias>
-    <lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujra</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
     <science_support grid="f09_t232"/>
     <science_support grid="f09_f09_mt232"/>
     <science_support grid="ne30pg3_t232"/>
@@ -218,16 +218,16 @@
 
   <compset>
     <alias>I1850Clm60BgcCropCrujraRsGs</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_SROF_SGLC_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-CROP_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>I1850Clm60Bgc</alias>
-    <lname>1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60BgcCrujra</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
 
@@ -239,11 +239,11 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCmip6</alias>
-    <lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraCmip6</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <!-- Primarily for testing the CMIP6WACCMDECK compset option -->
@@ -254,11 +254,11 @@
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCmip6waccm</alias>
-    <lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraCmip6waccm</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <!-- Primarily for testing - when we want builds and runs to be as
@@ -336,11 +336,11 @@
 
   <compset>
      <alias>I1850Clm60BgcNoAnthroRtm</alias>
-     <lname>1850_DATM%GSWP3v1_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_DGLC%NOEVOLVE_SWAV</lname>
+     <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_DGLC%NOEVOLVE_SWAV</lname>
    </compset>
   <compset>
      <alias>I1850Clm60BgcCrujraNoAnthroRtm</alias>
-     <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_DGLC%NOEVOLVE_SWAV</lname>
+     <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_DGLC%NOEVOLVE_SWAV</lname>
      <science_support grid="f09_t232"/>
      <science_support grid="f09_f09_mt232"/>
    </compset>
@@ -524,12 +524,12 @@
 
   <compset>
     <alias>I1850Clm50BgcSpinup</alias>
-    <lname>1850_DATM%CPLHIST_CLM50%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CPLHIST%CESM3_CLM50%BGC_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>I1850Clm60BgcCropSpinup</alias>
-    <lname>1850_DATM%CPLHIST_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_DATM%CPLHIST%CESM3_CLM60%BGC-CROP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
 <!-- I CLM50 NWP Compsets -->
@@ -606,11 +606,11 @@
 
   <compset>
     <alias>I1850Clm60BgcCropG</alias>
-    <lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
+    <lname>1850_DATM%GSWP3v1%CESM3_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
   </compset>
   <compset>
     <alias>I1850Clm60BgcCropCrujraG</alias>
-    <lname>1850_DATM%CRUJRA2024b_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
+    <lname>1850_DATM%CRUJRA2024b%CESM3_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
     <science_support grid="f09_t232"/>
     <science_support grid="f09_f09_mt232"/>
     <science_support grid="ne30pg3_t232"/>
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..d58728e439 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit af8c89fc027898ed4876ecec0b0f260661265ca6
+Subproject commit d58728e439f2be39b731bba19d104b97b9506d6c
diff --git a/components/cmeps b/components/cmeps
index 2d9b7d25ec..2b7c96f473 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 2d9b7d25ec415a43548ca212ec87e9f601e48ff4
+Subproject commit 2b7c96f473c41a22a3f605eef575b18f6de483b6