diff --git a/.github/workflows/docker-image-build-publish.yml b/.github/workflows/docker-image-build-publish.yml
new file mode 100644
index 0000000000..b52be7f031
--- /dev/null
+++ b/.github/workflows/docker-image-build-publish.yml
@@ -0,0 +1,83 @@
+# Based on https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action (last accessed 2025-05-09)
+name: Build and publish ctsm-docs Docker image
+
+on:
+  # Run this whenever something gets pushed to master
+  push:
+    branches: ['master']
+    paths:
+      - 'doc/ctsm-docs_container/Dockerfile'
+      - 'doc/ctsm-docs_container/requirements.txt'
+
+  # Run this whenever it's manually called
+  workflow_dispatch:
+
+jobs:
+  # This first job checks that the container can be built, and that we can use it to build the docs without error.
+  build-image-and-test-docs:
+    name: Build image and test docs
+    uses: ./.github/workflows/docker-image-common.yml
+    secrets: inherit
+
+  # This second job actually builds and publishes the container.
+  push-and-attest:
+    name: Publish and attest
+    runs-on: ubuntu-latest
+
+    # Wait to run this job until after build-image-and-test-docs. If that job fails, something might be wrong with the container, so don't try this one. (It might also have failed because of something wrong with doc-builder or the documentation.)
+    needs: build-image-and-test-docs
+
+    # Variables output by the build-image-and-test-docs job.
+    env:
+      REGISTRY: ${{ needs.build-image-and-test-docs.outputs.REGISTRY }}
+      IMAGE_NAME: ${{ needs.build-image-and-test-docs.outputs.IMAGE_NAME }}
+      IMAGE_TAG: ${{ needs.build-image-and-test-docs.outputs.image_tag }}
+
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # This step sets up Docker Buildx, which is needed for the multi-platform build in the next step
+      # https://docs.docker.com/build/ci/github-actions/multi-platform/
+      # v3.1.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
+
+      # This step uses the `docker/build-push-action` action to build the image, based on the ctsm-docs `Dockerfile`.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see [Usage](https://github.com/docker/build-push-action#usage) in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+      # v6.15.0
+      - name: Push Docker image
+        id: push
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+        with:
+          context: doc/ctsm-docs_container
+          platforms: linux/amd64,linux/arm64
+          push: true
+          load: false
+          tags: ${{ env.IMAGE_TAG }}
+          labels: ""
+
+      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
+
diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
new file mode 100644
index 0000000000..e013b888a7
--- /dev/null
+++ b/.github/workflows/docker-image-build.yml
@@ -0,0 +1,25 @@
+# Modified from https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action (last accessed 2025-05-09)
+name: Test building ctsm-docs Docker image and using it to build the docs
+
+# Configures this workflow to run every time a change in the Docker container setup is pushed to the master branch
+on:
+  push:
+    paths:
+      - 'doc/ctsm-docs_container/**'
+      - '.github/workflows/docker-image-ctsm-docs-build.yml'
+      - '.github/workflows/docker-image-build-common.yml'
+
+  pull_request:
+    paths:
+      - 'doc/ctsm-docs_container/**'
+      - '.github/workflows/docker-image-ctsm-docs-build.yml'
+      - '.github/workflows/docker-image-build-common.yml'
+
+  workflow_dispatch:
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-image-and-test-docs:
+    name: Build image and test docs
+    uses: ./.github/workflows/docker-image-common.yml
+    secrets: inherit
diff --git a/.github/workflows/docker-image-common.yml b/.github/workflows/docker-image-common.yml
new file mode 100644
index 0000000000..40cbd90ac3
--- /dev/null
+++ b/.github/workflows/docker-image-common.yml
@@ -0,0 +1,83 @@
+name: Workflow used by docker-image workflows
+
+on:
+  workflow_call:
+    outputs:
+      REGISTRY:
+        description: "Container registry"
+        value: ${{ jobs.build-image-and-test-docs.outputs.REGISTRY }}
+      IMAGE_NAME:
+        description: "Docker image name"
+        value: ${{ jobs.build-image-and-test-docs.outputs.IMAGE_NAME }}
+      image_tag:
+        description: "First image tag"
+        value: ${{ jobs.build-image-and-test-docs.outputs.image_tag }}
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+    REGISTRY: ghcr.io
+    IMAGE_NAME: ${{ github.repository }}/ctsm-docs
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-image-and-test-docs:
+    runs-on: ubuntu-latest
+    # Variables that might be needed by the calling workflow
+    outputs:
+      REGISTRY: ${{ env.REGISTRY }}
+      IMAGE_NAME: ${{ env.IMAGE_NAME }}
+      image_tag: ${{ steps.set-image-tag.outputs.IMAGE_TAG }}
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # This step uses the `docker/build-push-action` action to build the image, based on the ctsm-docs `Dockerfile`.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see [Usage](https://github.com/docker/build-push-action#usage) in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+      # v6.15.0
+      - name: Build Docker image
+        id: build-image
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+        with:
+          context: doc/ctsm-docs_container
+          push: false
+          load: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # Try building our docs using the new container
+      - name: Checkout doc-builder external
+        run: |
+          bin/git-fleximod update doc-builder
+      - name: Set image tag for docs build
+        id: set-image-tag
+        run: |
+          echo "IMAGE_TAG=$(echo '${{ steps.meta.outputs.tags }}' | cut -d',' -f1)" >> $GITHUB_ENV
+          echo "IMAGE_TAG=$(echo '${{ steps.meta.outputs.tags }}' | cut -d',' -f1)" >> $GITHUB_OUTPUT
+      - name: Build docs using container
+        id: build-docs
+        run: |
+          cd doc && ./build_docs -b ${PWD}/_build -c -d -i $IMAGE_TAG
diff --git a/.github/workflows/docs-common.yml b/.github/workflows/docs-common.yml
new file mode 100644
index 0000000000..6dd8f7d53b
--- /dev/null
+++ b/.github/workflows/docs-common.yml
@@ -0,0 +1,78 @@
+name: Jobs shared by docs workflows
+
+on:
+  workflow_call:
+    inputs:
+      use_conda:
+        required: false
+        type: boolean
+        default: false
+      conda_env_file:
+        required: false
+        type: string
+        default: ""
+      conda_env_name:
+        required: false
+        type: string
+        default: ""
+    secrets: {}
+
+jobs:
+  build-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          lfs: true
+
+      - name: Checkout doc-builder external
+        run: |
+          bin/git-fleximod update doc-builder
+
+      # Do this if not using conda
+      # Based on  https://github.com/actions/cache/blob/main/examples.md#python---pip
+      - name: Install python
+        if: ${{ ! inputs.use_conda }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.13.2'  # needs to be coordinated with version in python/conda_env_ctsm_py.txt
+      - name: Cache pip
+        if: ${{ ! inputs.use_conda }}
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('doc/ctsm-docs_container/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install Python requirements
+        if: ${{ ! inputs.use_conda }}
+        run: |
+          pip install -r doc/ctsm-docs_container/requirements.txt
+
+      # Do this if using conda
+      - name: Set up conda environment
+        if: ${{ inputs.use_conda }}
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: ${{ inputs.conda_env_name }}
+          environment-file: ${{ inputs.conda_env_file }}
+          channels: conda-forge
+          auto-activate-base: false
+
+      - name: Build Sphinx docs with makefile
+        run: |
+          if ${{ inputs.use_conda }}; then
+            conda run -n ${{ inputs.conda_env_name }} make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build -C doc/ html
+          else
+            make SPHINXOPTS="-W --keep-going" BUILDDIR=${PWD}/_build -C doc/ html
+          fi
+
+      - name: Build Sphinx docs with doc-builder
+        if: success() || failure()
+        run: |
+          if ${{ inputs.use_conda }}; then
+            cd doc && conda run -n ${{ inputs.conda_env_name }} ./build_docs -b ${PWD}/_build -c
+          else
+            cd doc && ./build_docs -b ${PWD}/_build -c
+          fi
diff --git a/.github/workflows/docs-ctsm_pylib.issue_template.md b/.github/workflows/docs-ctsm_pylib.issue_template.md
new file mode 100644
index 0000000000..dfeafd5b66
--- /dev/null
+++ b/.github/workflows/docs-ctsm_pylib.issue_template.md
@@ -0,0 +1,6 @@
+---
+title: Scheduled ctsm_pylib docs build test failed
+assignees: samsrabin
+labels: bug, next
+---
+{{ date }}: A failure occurred during the most recent run of the `test-build-docs-ctsm_pylib` job in `.github/workflows/docs-ctsm_pylib.yml`.
diff --git a/.github/workflows/docs-ctsm_pylib.yml b/.github/workflows/docs-ctsm_pylib.yml
new file mode 100644
index 0000000000..e4efc973a2
--- /dev/null
+++ b/.github/workflows/docs-ctsm_pylib.yml
@@ -0,0 +1,49 @@
+name: Test building docs with ctsm_pylib
+
+on:
+  push:
+    paths:
+      - 'python/conda_env_ctsm_py.txt'
+
+  pull_request:
+    paths:
+      - 'python/conda_env_ctsm_py.txt'
+
+  schedule:
+    # 8 am every Monday UTC
+    - cron: '0 8 * * 1'
+
+  workflow_dispatch:
+
+permissions:
+  contents: read
+jobs:
+  test-build-docs-ctsm_pylib:
+    if: ${{ always() }}
+    name: With ctsm_pylib
+    uses: ./.github/workflows/docs-common.yml
+    with:
+      use_conda: true
+      conda_env_file: python/conda_env_ctsm_py.yml
+      conda_env_name: ctsm_pylib
+
+  # File an issue if the docs build failed during a scheduled run
+  file-issue-on-failure:
+    if: |
+      failure() &&
+      github.event_name == 'schedule'
+    needs: test-build-docs-ctsm_pylib
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Create issue
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          filename: .github/workflows/docs-ctsm_pylib.issue_template.md
+          update_existing: true
+          search_existing: open
+
+
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 0000000000..8cc1b7c7c2
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,42 @@
+name: Test building docs when they're updated
+# Does not include a test of building docs with ctsm_pylib; that's in a different Workflow because we only want it to run when ctsm_pylib is updated.
+
+on:
+  push:
+    paths:
+      - 'doc/**'
+
+  pull_request:
+    paths:
+      - 'doc/**'
+
+  workflow_dispatch:
+
+permissions:
+  contents: read
+jobs:
+
+  test-build-docs:
+    if: ${{ always() }}
+    name: Without ctsm_pylib or container
+    uses: ./.github/workflows/docs-common.yml
+    with:
+      use_conda: false
+
+  test-build-docs-container:
+    if: ${{ always() }}
+    name: With container from registry
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Checkout doc-builder external
+        run: |
+          bin/git-fleximod update doc-builder
+
+      - name: Build docs using container
+        id: build-docs
+        run: |
+          cd doc && ./build_docs -b ${PWD}/_build -c -d
diff --git a/.gitignore b/.gitignore
index 7c74c9d8ca..278c0957f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,7 @@ core.*
 *.log !run.log
 *.pyc
 Depends
+
+# Docs build output
+_build*/
+
diff --git a/.gitmodules b/.gitmodules
index 9517410b54..0310b9efd9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.20
+fxtag = ccs_config_cesm1.0.23
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
@@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.1.59
+fxtag = cime6.1.72
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime
@@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.0.33
+fxtag = cmeps1.0.39
 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
@@ -100,7 +100,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
 [submodule "share"]
 path = share
 url = https://github.com/ESCOMP/CESM_share
-fxtag = share1.1.8
+fxtag = share1.1.9
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
@@ -124,7 +124,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
 [submodule "doc-builder"]
 path = doc/doc-builder
 url = https://github.com/ESMCI/doc-builder
-fxtag = v1.0.8
+fxtag = v2.0.0
 fxrequired = ToplevelOptional
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/doc-builder
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index 400c831b73..6cd11084fe 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -2190,11 +2190,8 @@ sub setup_logic_snow {
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_thermal_cond_method' );
-
-  my $var = $nl->get_value('snow_thermal_cond_method');
-  if ( $var ne "'Jordan1991'" && $var ne "'Sturm1997'" ) {
-    $log->fatal_error("$var is incorrect entry for the namelist variable snow_thermal_cond_method; expected Jordan1991 or Sturm1997");
-  }
+  add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_thermal_cond_glc_method' );
+  add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_thermal_cond_lake_method' );
 
   my $numrad_snw = $nl->get_value('snicar_numrad_snw');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsnowoptics',
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index f3b0fd8d0c..7adb380a61 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -484,6 +484,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <snow_thermal_cond_method>Jordan1991</snow_thermal_cond_method>
 <snow_thermal_cond_method phys="clm6_0">Sturm1997</snow_thermal_cond_method>
 
+<!-- TODO change clm6 to Jordan with answer changing tag for glacier mass ballance -->
+<snow_thermal_cond_glc_method>Jordan1991</snow_thermal_cond_glc_method>
+<snow_thermal_cond_glc_method phys="clm6_0">Sturm1997</snow_thermal_cond_glc_method>
+
+<!-- TODO change clm6 to Sturm with answer changing tag -->
+<snow_thermal_cond_lake_method>Jordan1991</snow_thermal_cond_lake_method>
+<snow_thermal_cond_lake_method phys="clm6_0">Jordan1991</snow_thermal_cond_lake_method>
+
 <!-- Default glacier behavior is:
      Mountain glaciers: single_at_atm_topo
      Currently-unused region 1: UNSET
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index b13b4399f0..820975655d 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -2959,6 +2959,16 @@ SwensonLawrence2012: Swenson and Lawrence 2012
 Parameterization to use for snow thermal conductivity
 </entry>
 
+<entry id="snow_thermal_cond_glc_method" type="char*25" category="clm_physics"
+       group="clm_inparm" valid_values="Jordan1991,Sturm1997" >
+Parameterization to use for snow thermal conductivity over glacier land units
+</entry>
+
+<entry id="snow_thermal_cond_lake_method" type="char*25" category="clm_physics"
+       group="clm_inparm" valid_values="Jordan1991,Sturm1997" >
+Parameterization to use for snow thermal conductivity over lake land units
+</entry>
+
 <!-- ========================================================================================  -->
 <!-- Namelist options related to water tracers                                                 -->
 <!-- ========================================================================================  -->
diff --git a/ccs_config b/ccs_config
index 77fd32c6c4..c1f57b1db9 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit 77fd32c6c4b57bb195239753f4c7838f05c1dfe8
+Subproject commit c1f57b1db90529fdc3766777103c8d6a9cd4ccb2
diff --git a/cime b/cime
index addf9e67ce..71d2b71216 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit addf9e67ceeb0e056de33ee793d67491176dd3a5
+Subproject commit 71d2b71216cc39abfb8224cc55861bd6424c95f9
diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml
index e78861e451..c219a1d1ef 100644
--- a/cime_config/config_archive.xml
+++ b/cime_config/config_archive.xml
@@ -8,14 +8,12 @@
     <hist_file_extension>e</hist_file_extension>
     <rest_history_varname>locfnh</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
+      <rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
       <rpointer_content>./$CASE.clm2$NINST_STRING.r.$DATENAME.nc</rpointer_content>
     </rpointer>
     <test_file_names>
-      <tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
-      <tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
-      <tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
-      <tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
+      <tfile disposition="copy">rpointer.lnd</tfile>
+      <tfile disposition="copy">rpointer.lnd_9999</tfile>
       <tfile disposition="copy">casename.clm2.r.1976-01-01-00000.nc</tfile>
       <tfile disposition="copy">casename.clm2.rh4.1976-01-01-00000.nc</tfile>
       <tfile disposition="move">casename.clm2.h0.1976-01-01-00000.nc</tfile>
@@ -34,14 +32,12 @@
     <hist_file_extension>e</hist_file_extension>
     <rest_history_varname>locfnh</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
+      <rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
       <rpointer_content>./$CASE.ctsm$NINST_STRING.r.$DATENAME.nc</rpointer_content>
     </rpointer>
     <test_file_names>
-      <tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
-      <tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
-      <tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
-      <tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
+      <tfile disposition="copy">rpointer.lnd</tfile>
+      <tfile disposition="copy">rpointer.lnd_9999</tfile>
       <tfile disposition="copy">casename.ctsm.r.1976-01-01-00000.nc</tfile>
       <tfile disposition="copy">casename.ctsm.rh4.1976-01-01-00000.nc</tfile>
       <tfile disposition="move">casename.ctsm.h0.1976-01-01-00000.nc</tfile>
diff --git a/components/cmeps b/components/cmeps
index 4b636c6f79..189b02e2b3 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 4b636c6f794ca02d854d15c620e26644751b449b
+Subproject commit 189b02e2b36b9a5a064150179721de45af3bbacf
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f94a553685..e594c688a0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,79 @@
 ===============================================================
+Tag name: ctsm5.3.043
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Fri 09 May 2025 12:28:17 PM MDT
+One-line Summary: Merge b4b-dev
+
+Purpose and description of changes
+----------------------------------
+
+ Updates to the b4b-dev branch since its last merge to master (PRs #3091 #3092), as shown by git log:
+
+ - Merge pull request Update docs infrastructure #2809 from samsrabin/update-docs-builder-2
+   Update docs infrastructure
+ - Merge pull request Update externals to cesm3_0_alpha06c #3106 from ekluzek/update_to_alpha06c
+   Update externals to cesm3_0_alpha06c
+ - Merge pull request User control over snow thermal conductivity scheme over glaciers #3072 from wwieder/JordanGlacier
+   User control over snow thermal conductivity scheme over glaciers
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+Resolves #2818 Update doc-builder
+Resolves #3098 st-archive issues in ctsm5.3.041
+Resolves #3071 Opt to use Jordan1991 over glacier land
+Resolves #3080 Lake snow thermal conductivity hard coded to Jordan
+
+Notes of particular relevance for users
+---------------------------------------
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+ Introduce user control over snow thermal conductivity scheme over glaciers
+
+Changes to documentation:
+ #2809 updates docs infrastructure
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+ #3106 updates submodules to cesm3_0_alpha06c
+
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/3123
+
+===============================================================
+===============================================================
 Tag name: ctsm5.3.042
 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
 Date: Thu May  8 16:15:48 MDT 2025
diff --git a/doc/ChangeSum b/doc/ChangeSum
index e0fe92e5aa..e805a39512 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.3.043   slevis 05/09/2025 Merge b4b-dev
        ctsm5.3.042 glemieux 05/08/2025 Update FATES tag, tests and address namelist option bug
        ctsm5.3.041 samrabin 04/25/2025 Merge b4b-dev to master
        ctsm5.3.040 samrabin 04/15/2025 Update ctsm_pylib to 3.13.2
diff --git a/doc/Makefile b/doc/Makefile
index 49e9764b7a..7e74b6e545 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,7 +17,7 @@ help:
 # have configured this repository (via an .lfsconfig file at the top level) to NOT
 # automatically fetch any of the large files when cloning / fetching.
 fetch-images:
-	git lfs install
+	git lfs install --force
 	git lfs pull --exclude="" --include=""
 
 .PHONY: help fetch-images Makefile
diff --git a/doc/build_docs b/doc/build_docs
index 45c7099ec5..89434622a6 100755
--- a/doc/build_docs
+++ b/doc/build_docs
@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
+set -e
 
-if [ -f doc-builder/build_docs ]; then
-    echo "Running: make fetch-images"
-    make fetch-images
-    echo "Running: ./doc-builder/build_docs $@"
-    ./doc-builder/build_docs "$@"
-else
-    echo "Obtain doc-builder by running './bin/git-fleximod update --optional' from the top-level"
+if [ ! -f doc-builder/build_docs ]; then
+    script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+    ${script_dir}/../bin/git-fleximod update doc-builder
 fi
+
+echo "Running: make fetch-images"
+make fetch-images
+
+echo "Running: ./doc-builder/build_docs $@"
+./doc-builder/build_docs "$@"
+
+exit 0
\ No newline at end of file
diff --git a/doc/ctsm-docs_container/Dockerfile b/doc/ctsm-docs_container/Dockerfile
new file mode 100644
index 0000000000..90e3a6160e
--- /dev/null
+++ b/doc/ctsm-docs_container/Dockerfile
@@ -0,0 +1,31 @@
+###################################################################
+# A base linux install + packages for building CTSM documentation #
+###################################################################
+
+FROM python:3.13.2-alpine
+
+# Update the default packages and install some other necessary ones
+RUN apk update
+RUN apk add --no-cache git sudo
+RUN apk add --no-cache git-lfs
+RUN apk add --no-cache make
+ADD requirements.txt requirements.txt
+RUN pip3 install --break-system-packages -r requirements.txt
+
+# Add user etc.
+RUN addgroup escomp
+RUN adduser -h /home/user -G escomp -s /bin/bash -D user
+RUN echo 'export USER=$(whoami)' >> /etc/profile.d/escomp.sh
+RUN echo 'export PS1="[\u@escomp \W]\$ "' >> /etc/profile.d/escomp.sh
+RUN echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/escomp
+
+ENV SHELL=/bin/bash \
+    LANG=C.UTF-8  \
+    LC_ALL=C.UTF-8
+
+USER user
+WORKDIR /home/user
+CMD ["/bin/bash", "-l"]
+
+LABEL org.opencontainers.image.title="Container for building CTSM documentation"
+LABEL org.opencontainers.image.source=https://github.com/ESCOMP/CTSM
\ No newline at end of file
diff --git a/doc/ctsm-docs_container/README.md b/doc/ctsm-docs_container/README.md
new file mode 100644
index 0000000000..bdd4eb3fa7
--- /dev/null
+++ b/doc/ctsm-docs_container/README.md
@@ -0,0 +1,57 @@
+# The ctsm-docs container
+This directory and its Dockerfile are used to build a Docker container for building the CTSM documentation. Unless you're a developer working on the container, you probably don't need to care about anything in here.
+
+## Introduction
+
+This Readme tells you how to update the ctsm-docs Docker container if a need to do so arises—for example, adding a Python module that brings new functionality in the build. After you've followed all these instructions, you will probably want to push an update to [doc-builder](https://github.com/ESMCI/doc-builder) that updates `DEFAULT_DOCKER_IMAGE` in [build_commands.py](https://github.com/ESMCI/doc-builder/blob/master/doc_builder/build_commands.py) to point to the new tag.
+
+## Building
+
+If you actually want to build the container, make sure Docker is running. In the Docker Desktop settings, make sure you've enabled the [`continerd` image store](https://docs.docker.com/desktop/features/containerd/), which allows multi-platform builds. Then do:
+```shell
+docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/escomp/ctsm/ctsm-docs .
+```
+
+To use your new version for local testing, you'll need to tell doc-builder to use that image. Call `docker images`, which should return something like this:
+```shell
+REPOSITORY                      TAG          IMAGE ID       CREATED         SIZE
+ghcr.io/escomp/ctsm/ctsm-docs   latest       ab51446519a4   3 seconds ago   233MB
+...
+```
+
+To test, you can tell `build_docs` to use your new version by adding `--docker-image IMAGE_ID` to your call, where in the example above `IMAGE_ID` is `ab51446519a4`.
+
+## Publishing
+
+### Pushing to GitHub Container Registry
+If you want to publish the container, you first need a [GitHub Personal Access Token (Classic)](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#personal-access-tokens-classic) with the `write:packages` permissions. You can see your existing PAT(C)s [here](https://github.com/settings/tokens). If you don't have one with the right permissions, [this link](https://github.com/settings/tokens/new?scopes=write:packages) should start the setup process for you.
+
+Once you have a PAT(C), you can authenticate in your shell session like so:
+
+```shell
+   echo YOUR_PERSONAL_ACCESS_TOKEN_CLASSIC | docker login ghcr.io -u YOUR_USERNAME --password-stdin
+```
+The leading spaces are intended to prevent this command, which contains your secret PAT(C), from being written to your shell's history file. That at least works in bash... sometimes. To be extra safe, in bash you can do `history -c` and it will clear the session's history entirely.
+
+### Tagging
+You'll next need to tag the image. Lots of Docker instructions tell you to use the `latest` tag, and Docker may actually do that for you. However, `latest` can lead to support headaches as users think they have the right version but actually don't. Instead, you'll make a new version number incremented from the [previous one](https://github.com/ESCOMP/CTSM/pkgs/container/ctsm%2Fctsm-docs/versions), in the `vX.Y.Z` format.
+
+Copy the relevant image ID (see `docker images` instructions above) and tag it with your version number like so:
+```shell
+docker tag ab51446519a4 ghcr.io/escomp/ctsm/ctsm-docs:vX.Y.Z
+```
+
+Push to the repo:
+```shell
+docker push ghcr.io/escomp/ctsm/ctsm-docs:vX.Y.Z
+```
+
+Then browse to the [container's GitHub page](https://github.com/ESCOMP/CTSM/pkgs/container/ctsm%2Fctsm-docs) to make sure this all worked and the image is public.
+
+### Updating doc-builder
+Since you've updated the container, you will probably want to tell [doc-builder](https://github.com/ESMCI/doc-builder) to use the new one. Open a PR where you change the tag (the part after the colon) in the definition of `DEFAULT_DOCKER_IMAGE` in `doc_builder/build_commands.py`. Remember, **use the version number**, not "latest".
+
+## See also
+
+- [GitHub: Working with the container registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry)
+- [GitHub: Connecting a repository to a package](https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package)
\ No newline at end of file
diff --git a/doc/ctsm-docs_container/requirements.txt b/doc/ctsm-docs_container/requirements.txt
new file mode 100644
index 0000000000..178f356b13
--- /dev/null
+++ b/doc/ctsm-docs_container/requirements.txt
@@ -0,0 +1,6 @@
+# Python packages used for building docs
+rst2pdf == 0.103.1
+sphinx == 8.2.3
+sphinxcontrib_programoutput == 0.18
+sphinx-mdinclude == 0.6.2
+sphinx_rtd_theme == 3.0.2
diff --git a/doc/doc-builder b/doc/doc-builder
index ab9bc93dd0..9a25c4a20d 160000
--- a/doc/doc-builder
+++ b/doc/doc-builder
@@ -1 +1 @@
-Subproject commit ab9bc93dd09d0173f8097c7a18c7d061c1cd3b79
+Subproject commit 9a25c4a20db152f57f334c2eb86ea5246b406674
diff --git a/doc/source/_static/pop_ver.js b/doc/source/_static/pop_ver.js
deleted file mode 100644
index b8c58658a8..0000000000
--- a/doc/source/_static/pop_ver.js
+++ /dev/null
@@ -1,37 +0,0 @@
-$(document).ready(function() {
-    /* For a URL that looks like
-    https://blah.github.io/versions/VERSIONFOO/html/bar/index.html, set cur_version_dir to
-    'VERSIONFOO' (i.e., the portion of the path following 'versions').
-    */
-    var proj_end = document.baseURI.indexOf("versions") + 9;
-    var end = document.baseURI.indexOf("/", proj_end);
-    var cur_version_dir = document.baseURI.substring(proj_end, end);
-    var mylist = $("#version-list");
-    mylist.empty();
-    $.getJSON(version_json_loc, function(data) {
-        if (data.hasOwnProperty(cur_version_dir)) {
-            /* First add the current version so that it appears first in the drop-down
-               menu and starts as the selected element of the menu. If you click on the
-               current version, you should stay at the current page.
-
-               The conditional around this block should generally be true, but we check it
-               just in case the current version is missing from the versions.json file for
-               some reason.
-            */
-            cur_version_name = data[cur_version_dir];
-            mylist.append($("<option>", {value: document.baseURI, text: cur_version_name}));
-        }
-        // Now add the other versions
-        $.each(data, function(version_dir, version_name) {
-            if (version_dir != cur_version_dir) {
-                /* If you click on a different version, you should go to the root of the
-                   documentation for that version. This assumes paths like
-                   https://blah.github.io/versions/VERSIONFOO/html/bar/index.html. So we
-                   need to go up two levels from the URL_ROOT (html) to then go back down
-                   into the appropriate version's html directory.
-                */
-                mylist.append($("<option>", {value: DOCUMENTATION_OPTIONS.URL_ROOT + '../../' + version_dir + '/html', text: version_name}));
-            }
-        });
-    });
-});
diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
deleted file mode 100644
index 6ec6be4302..0000000000
--- a/doc/source/_templates/layout.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "!layout.html" %}
-
-{% set script_files = script_files + ["_static/pop_ver.js"] %}
\ No newline at end of file
diff --git a/doc/source/_templates/versions.html b/doc/source/_templates/versions.html
new file mode 100644
index 0000000000..d219003644
--- /dev/null
+++ b/doc/source/_templates/versions.html
@@ -0,0 +1,26 @@
+<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+  <span class="rst-current-version" data-toggle="rst-current-version">
+    Version: {{ current_version }}
+    <span class="fa fa-caret-down"></span>
+  </span>
+  <div class="rst-other-versions">
+    {% if languages|length >= 1 %}
+    <dl>
+      <dt>{{ _('Languages') }}</dt>
+        {% for the_language, url in languages %}
+          <dd><a href="{{ url }}/index.html">{{ the_language }}</a></dd>
+        {% endfor %}
+    </dl>
+    {% endif %}
+    {% if versions|length >= 1 %}
+    <dl>
+      <dt>{{ _('Versions') }}</dt>
+      {% for the_version, url in versions %}
+        <dd><a href="{{ url }}/index.html">{{ the_version }}</a></dd>
+      {% endfor %}
+    </dl>
+    {% endif %}
+    <br>
+    </dl>
+  </div>
+</div>
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 894e9b6c66..fc88b1e359 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -18,10 +18,7 @@
 #
 import os
 import sys
-# Note that we need a specific version of sphinx_rtd_theme. This can be obtained with:
-# pip install git+https://github.com/esmci/sphinx_rtd_theme.git@version-dropdown-with-fixes
 import sphinx_rtd_theme
-# sys.path.insert(0, os.path.abspath('.'))
 
 
 # -- General configuration ------------------------------------------------
@@ -37,7 +34,9 @@
     'sphinx.ext.autodoc',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
-    'sphinx.ext.githubpages']
+    'sphinx.ext.githubpages',
+    'sphinx_mdinclude',
+    ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -46,7 +45,7 @@
 # You can specify multiple suffix as a list of string:
 #
 source_suffix = ['.rst', '.md']
-#source_suffix = '.rst'
+# source_suffix = '.rst'
 
 # The master toctree document.
 master_doc = 'index'
@@ -67,6 +66,9 @@
 # CTSM-specific: version label used at the top of some pages.
 version_label = 'the latest development code'
 
+# List of versions to populate version picker dropdown menu
+version_list = ["latest", "release-clm5.0"]
+
 # version_label is not a standard sphinx variable, so we need some custom rst to allow
 # pages to use it. We need a separate replacement for the bolded version because it
 # doesn't work to have variable replacements within formatting.
@@ -80,7 +82,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -103,15 +105,6 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#
-# The 'versions' option needs to have at least two versions to work, but it doesn't need
-# to have all versions: others will be added dynamically. Note that this maps from version
-# names to html links. The current version can link to the current location (i.e., do
-# nothing). For the other version, we just add a place-holder; its name and value are
-# unimportant because these versions will get replaced dynamically.
-html_theme_options = {}
-html_theme_options['versions'] = {version: ''}
-html_theme_options['versions']['[placeholder]'] = ''
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -178,7 +171,7 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {'python': ('https://docs.python.org/', None)}
 
 numfig = True
 numfig_format = {'figure': 'Figure %s',
@@ -190,3 +183,18 @@
 
 def setup(app):
     app.add_css_file('css/custom.css')
+
+try:
+    html_context
+except NameError:
+    html_context = dict()
+
+html_context["display_lower_left"] = True
+
+html_context["current_language"] = language
+
+html_context["current_version"] = os.environ.get("current_version")
+
+html_context["versions"] = []
+for this_version in version_list:
+    html_context["versions"].append([this_version, f"../../../versions/{this_version}/html"])
diff --git a/doc/source/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.rst b/doc/source/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.rst
index 2840d37176..ec43a50cd8 100755
--- a/doc/source/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.rst
+++ b/doc/source/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.rst
@@ -720,7 +720,7 @@ Note that :math:`w_{target}` is truly supposed to give the target soil moisture
 
 :math:`N_{irr}` is the index of the soil layer corresponding to a specified depth :math:`z_{irrig}` (:numref:`Table Irrigation parameters`) and :math:`\Delta z_{j}` is the thickness of the soil layer in layer :math:`j` (section :numref:`Vertical Discretization`). :math:`\theta_{j}` is the volumetric soil moisture in layer :math:`j` (section :numref:`Soil Water`). :math:`\theta_{target}` and :math:`\theta_{wilt}` are the target and wilting point volumetric soil moisture values, respectively, and are determined by inverting :eq:`7.94` using soil matric potential parameters :math:`\Psi_{target}` and :math:`\Psi_{wilt}` (:numref:`Table Irrigation parameters`). After the soil moisture deficit :math:`D_{irrig}` is calculated, irrigation in an amount equal to :math:`\frac{D_{irrig}}{T_{irrig}}` (mm/s) is applied uniformly over the irrigation period :math:`T_{irrig}` (s). Irrigation water is applied directly to the ground surface, bypassing canopy interception (i.e., added to :math:`{q}_{grnd,liq}`: section :numref:`Canopy Water`).
 
-To conserve mass, irrigation is removed from river water storage (Chapter :numref:`rst_River Transport Model (RTM)`). When river water storage is inadequate to meet irrigation demand, there are two options: 1) the additional water can be removed from the ocean model, or 2) the irrigation demand can be reduced such that river water storage is maintained above a specified threshold.
+To conserve mass, irrigation is removed from river water storage (Chapter :numref:`rst_MOSART`). When river water storage is inadequate to meet irrigation demand, there are two options: 1) the additional water can be removed from the ocean model, or 2) the irrigation demand can be reduced such that river water storage is maintained above a specified threshold.
 
 .. _Table Irrigation parameters:
 
diff --git a/doc/source/tech_note/Glacier/CLM50_Tech_Note_Glacier.rst b/doc/source/tech_note/Glacier/CLM50_Tech_Note_Glacier.rst
index 9ed8fe280e..4c15ebbf56 100644
--- a/doc/source/tech_note/Glacier/CLM50_Tech_Note_Glacier.rst
+++ b/doc/source/tech_note/Glacier/CLM50_Tech_Note_Glacier.rst
@@ -102,11 +102,11 @@ The default behaviors for the world's glacier and ice sheet regions are describe
 
 .. note::
 
-It is possible to have non-virtual, non-SMB-computing areas within the CISM domain (as is the case for the portion of CISM's Greenland domain outside of Greenland itself). However, these areas will send 0 SMB and will not be able to adjust to CISM-dictated changes in glacier area. Therefore, it is best to set up the glacier regions and their behaviors so that as much of the CISM domain as possible is covered by virtual, SMB-computing areas.
+   It is possible to have non-virtual, non-SMB-computing areas within the CISM domain (as is the case for the portion of CISM's Greenland domain outside of Greenland itself). However, these areas will send 0 SMB and will not be able to adjust to CISM-dictated changes in glacier area. Therefore, it is best to set up the glacier regions and their behaviors so that as much of the CISM domain as possible is covered by virtual, SMB-computing areas.
 
 .. note::
 
- The combination of the ``Glacial melt = Replaced by ice`` and the ``Ice runoff = Melted`` behaviors results in particularly non-physical behavior: During periods of glacial melt, a negative ice runoff is generated (due to the ``Glacial melt = Replaced by ice`` behavior); this negative ice runoff is converted to a negative liquid runoff plus a positive sensible heat flux (due to the ``Ice runoff = Melted`` behavior). The net result is zero runoff but a positive sensible heat flux generated from glacial melt. Because of how physically unrealistic this is, CLM does not allow this combination of behaviors.
+   The combination of the ``Glacial melt = Replaced by ice`` and the ``Ice runoff = Melted`` behaviors results in particularly non-physical behavior: During periods of glacial melt, a negative ice runoff is generated (due to the ``Glacial melt = Replaced by ice`` behavior); this negative ice runoff is converted to a negative liquid runoff plus a positive sensible heat flux (due to the ``Ice runoff = Melted`` behavior). The net result is zero runoff but a positive sensible heat flux generated from glacial melt. Because of how physically unrealistic this is, CLM does not allow this combination of behaviors.
 
 .. _Multiple elevation class scheme:
 
diff --git a/doc/source/tech_note/Hydrology/CLM50_Tech_Note_Hydrology.rst b/doc/source/tech_note/Hydrology/CLM50_Tech_Note_Hydrology.rst
index 130629f0eb..df7705be8b 100644
--- a/doc/source/tech_note/Hydrology/CLM50_Tech_Note_Hydrology.rst
+++ b/doc/source/tech_note/Hydrology/CLM50_Tech_Note_Hydrology.rst
@@ -923,7 +923,7 @@ Runoff from glaciers and snow-capped surfaces
 
 All surfaces are constrained to have a snow water equivalent :math:`W_{sno} \le W_{cap} = 10,000` kg m\ :sup:`-2`. For snow-capped columns, any addition of mass at the top (precipitation, dew/riping) is balanced by an equally large mass flux at the bottom of the snow column. This so-called capping flux is separated into solid :math:`q_{snwcp,ice}` \ and liquid :math:`q_{snwcp,liq}` runoff terms. The partitioning of these phases is based on the phase ratio in the bottom snow layer at the time of the capping, such that phase ratio in this layer is unaltered.
 
-The :math:`q_{snwcp,ice}` runoff is sent to the River Transport Model (RTM) (Chapter 11) where it is routed to the ocean as an ice stream and, if applicable, the ice is melted there.
+The :math:`q_{snwcp,ice}` runoff is sent to MOSART (Chapter :numref:`rst_MOSART`) where it is routed to the ocean as an ice stream and, if applicable, the ice is melted there.
 
 For snow-capped surfaces other than glaciers and lakes the :math:`q_{snwcp,liq}` runoff is assigned to the glaciers and lakes runoff term :math:`q_{rgwl}` (e.g. :math:`q_{rgwl} =q_{snwcp,liq}` ). For glacier surfaces the runoff term :math:`q_{rgwl}` is calculated from the residual of the water balance
 
@@ -939,4 +939,4 @@ where :math:`W_{b}^{n}` and :math:`W_{b}^{n+1}` are the water balances at the be
 
    W_{b} =W_{can} +W_{sno} +\sum _{i=1}^{N}\left(w_{ice,i} +w_{liq,i} \right) .
 
-Currently, glaciers are non-vegetated and :math:`E_{v} =W_{can} =0`. The contribution of lake runoff to :math:`q_{rgwl}` is described in section :numref:`Precipitation, Evaporation, and Runoff Lake`. The runoff term :math:`q_{rgwl}` may be negative for glaciers and lakes, which reduces the total amount of runoff available to the river routing model (Chapter :numref:`rst_River Transport Model (RTM)`).
+Currently, glaciers are non-vegetated and :math:`E_{v} =W_{can} =0`. The contribution of lake runoff to :math:`q_{rgwl}` is described in section :numref:`Precipitation, Evaporation, and Runoff Lake`. The runoff term :math:`q_{rgwl}` may be negative for glaciers and lakes, which reduces the total amount of runoff available to the river routing model (Chapter :numref:`rst_MOSART`).
diff --git a/doc/source/tech_note/Introduction/CLM50_Tech_Note_Introduction.rst b/doc/source/tech_note/Introduction/CLM50_Tech_Note_Introduction.rst
index abf8898ef0..bb0ab9eef5 100644
--- a/doc/source/tech_note/Introduction/CLM50_Tech_Note_Introduction.rst
+++ b/doc/source/tech_note/Introduction/CLM50_Tech_Note_Introduction.rst
@@ -263,7 +263,7 @@ Biogeophysical and biogeochemical processes are simulated for each subgrid land
 
 #. Glacier processes (Chapter :numref:`rst_Glaciers`)
 
-#. River routing and river flow (Chapter :numref:`rst_River Transport Model (RTM)`)
+#. River routing and river flow (Chapter :numref:`rst_MOSART`)
 
 #. Urban energy balance and climate (Chapter :numref:`rst_Urban Model (CLMU)`)
 
diff --git a/doc/source/tech_note/MOSART/CLM50_Tech_Note_MOSART.rst b/doc/source/tech_note/MOSART/CLM50_Tech_Note_MOSART.rst
index 3c10cd4507..674e4cc0b3 100644
--- a/doc/source/tech_note/MOSART/CLM50_Tech_Note_MOSART.rst
+++ b/doc/source/tech_note/MOSART/CLM50_Tech_Note_MOSART.rst
@@ -1,7 +1,7 @@
-.. _rst_River Transport Model (RTM):
+.. _rst_MOSART:
 
 Model for Scale Adaptive River Transport (MOSART)
-=================================================
+====================================================
 
 .. _Overview MOSART:
 
@@ -21,9 +21,9 @@ MOSART divides each spatial unit such as a lat/lon grid or watershed into three
 
 .. _Figure MOSART conceptual diagram:
 
-.. figure:: mosart_diagram.png
-    :width: 800px
-    :height: 400px
+.. Figure:: mosart_diagram.png
+
+ MOSART conceptual diagram
 
 MOSART only routes positive runoff, although negative runoff can be generated occasionally by the land model (e.g., :math:`q_{gwl}`). Negative runoff in any runoff component including :math:`q_{sur}`, :math:`q_{sub}`, :math:`q_{gwl}` is not routed through MOSART, but instead is mapped directly from the spatial unit where it is generated at any time step to the coupler.
 
diff --git a/doc/source/users_guide/index.rst b/doc/source/users_guide/index.rst
index 0bb2dbd75d..39c35f128c 100644
--- a/doc/source/users_guide/index.rst
+++ b/doc/source/users_guide/index.rst
@@ -27,5 +27,6 @@
    trouble-shooting/index.rst
    testing/index.rst
    using-mesh-maker/index.rst
+   working-with-documentation/index.rst
 
 Documentation was built: |today|
diff --git a/doc/source/users_guide/overview/quickstart.rst b/doc/source/users_guide/overview/quickstart.rst
index 63f4afea6f..a7f41d4ae9 100644
--- a/doc/source/users_guide/overview/quickstart.rst
+++ b/doc/source/users_guide/overview/quickstart.rst
@@ -11,7 +11,7 @@ Running the CLM requires a suite of UNIX utilities and programs and you should m
 List of utilities required for CESM in the `Software/OS Prerequisites <https://www2.cesm.ucar.edu/models/cesm1.2/cesm/doc/usersguide/x32.html#software_system_prerequisites>`_ section of the CESM User's Guide.
 
 - UNIX bash shell (for some of the CLM tools scripts)
-- NCL (for some of the offline tools for creating/modifying CLM input datasets; see :ref:`using-ncl` for more information)
+- NCL (for some of the offline tools for creating/modifying CLM input datasets)
 - Python
 
 Before working with |version| read the `CESM QuickStart Guide <https://escomp.github.io/CESM/versions/cesm2.2/html/>`_. Once you are familiar with how to setup cases for any type of simulation with CESM you will want to direct your attention to the specifics of using CLM.
diff --git a/doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst b/doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
index c84d2a136d..b0d30d11c7 100644
--- a/doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
+++ b/doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
@@ -6,6 +6,7 @@
 
 .. todo::
   Update the below, as domain files aren't needed with nuopc.
+
 The tools **cprnc** and **gen_domain** use the CIME configure/build system which is described in the next section.
 
 The only CLM FORTRAN tool is mksurfdata_esmf which has it's own build system that takes advantage of the cime build.
diff --git a/doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst b/doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
index df7988451d..27c7c8efe4 100644
--- a/doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
+++ b/doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
@@ -23,6 +23,7 @@ The list of generally important scripts and programs are as follows.
 
 .. todo::
     Update the below, as domain files aren't needed with nuopc.
+
 #. *$CIMEROOT/tools/mapping/gen_domain_files/gen_domain* to create a domain file for datm from a mapping file. The domain file is then used by BOTH datm AND CLM to define the grid and land-mask.
 
 #. ``$CIMEROOT/tools/mapping/gen_domain_files/gen_domain`` to create a domain file for datm from a mapping file. The domain file is then used by BOTH datm AND CLM to define the grid and land-mask.
diff --git a/doc/source/users_guide/working-with-documentation/building-docs-multiple-versions.md b/doc/source/users_guide/working-with-documentation/building-docs-multiple-versions.md
new file mode 100644
index 0000000000..738af6b8ba
--- /dev/null
+++ b/doc/source/users_guide/working-with-documentation/building-docs-multiple-versions.md
@@ -0,0 +1,18 @@
+.. _building-docs-multiple-versions:
+
+# Building multiple versions of the documentation
+
+There is a menu in the lower left of the webpage that lets readers switch between different versions of the documentation. Populating this menu involves a few steps.
+
+First, look at the `version_list` line in `docs/conf.py`. Edit that list as needed so it contains the name of each version you want.
+
+Next, you will need to build the documentation once for each version. To build a version called `latest`, you would first check out the corresponding version of the docs, then do:
+
+```shell
+cd doc
+./build_docs -r $HOME/path/to/build-dir -d -v latest
+```
+
+This will build the documentation in `$HOME/path/to/build-dir/versions/latest`. Open `$HOME/path/to/build-dir/versions/latest/html/index.html` to see the result.
+
+You can also leave off the `-v latest`, in which case the current Git branch name will be used as the version name. Note, though, that in this case you will need to manually create the `$HOME/path/to/build-dir/versions/branch-name/` directory if it doesn't already exist.
diff --git a/doc/source/users_guide/working-with-documentation/building-docs-original-wiki.md b/doc/source/users_guide/working-with-documentation/building-docs-original-wiki.md
new file mode 100644
index 0000000000..20a739847f
--- /dev/null
+++ b/doc/source/users_guide/working-with-documentation/building-docs-original-wiki.md
@@ -0,0 +1,519 @@
+.. _building-docs-original-wiki:
+
+# ⚠️ Original docs documentation from the GitHub Wiki
+
+.. todo::
+
+   ⚠️⚠️⚠️WARNING⚠️⚠️⚠️
+   This page contains documentation that (a) is more complicated than you probably require and (b) has not been fully checked for accuracy with the latest documentation setup. Unless you have a very good reason, you should probably go to :ref:`docs-intro-and-recommended`.
+
+
+## Table of contents
+
+* [Intro to the CTSM documentation](#intro-to-the-ctsm-documentation)
+* [What do I, as a contributor, need to do to update the tech note for my new feature?](#what-do-i-as-a-contributor-need-to-do-to-update-the-tech-note-for-my-new-feature)
+* [Quick start to building the documentation](#quick-start-to-building-the-documentation)
+* [Overview of the recommended build method and alternative methods](#overview-of-the-recommended-build-method-and-alternative-methods)
+* [One-time setup needed for a given machine](#one-time-setup-needed-for-a-given-machine)
+   * [Prerequisites](#prerequisites)
+   * [Install Docker and download the required container](#install-docker-and-download-the-required-container)
+   * [Install git-lfs](#install-git-lfs)
+* [Management of image files](#management-of-image-files)
+   * [Obtaining the image files](#obtaining-the-image-files)
+   * [Seeing what files are tracked by git-lfs](#seeing-what-files-are-tracked-by-git-lfs)
+   * [Adding a new image file type](#adding-a-new-image-file-type)
+* [Procedure for building the html documentation](#procedure-for-building-the-html-documentation)
+   * [Recommended directory structure for these directions](#recommended-directory-structure-for-these-directions)
+   * [Initial steps for building the documentation](#initial-steps-for-building-the-documentation)
+   * [Building a test version of the documentation for your own review](#building-a-test-version-of-the-documentation-for-your-own-review)
+   * [Previewing the built documentation](#previewing-the-built-documentation)
+   * [Updating the official html documentation](#updating-the-official-html-documentation)
+   * [Dealing with errors](#dealing-with-errors)
+      * [Input/output error](#inputoutput-error)
+   * [Adding a new version](#adding-a-new-version)
+* [Building a pdf of the tech note](#building-a-pdf-of-the-tech-note)
+* [Resources for learning markup with reStructuredText and using Sphinx.](#resources-for-learning-markup-with-restructuredtext-and-using-sphinx)
+* [Appendix: Other build methods](#appendix-other-build-methods)
+   * [Running build_docs from all of these methods](#running-build_docs-from-all-of-these-methods)
+   * [Relying more heavily on the Docker container](#relying-more-heavily-on-the-docker-container)
+      * [Launching the Docker image](#launching-the-docker-image)
+      * [Building the documentation](#building-the-documentation)
+      * [Viewing the built documentation](#viewing-the-built-documentation)
+      * [Committing to git repositories](#committing-to-git-repositories)
+   * [Installing required software on your desktop/laptop (instructions for Mac)](#installing-required-software-on-your-desktoplaptop-instructions-for-mac)
+      * [Prerequisites / assumptions](#prerequisites--assumptions)
+      * [Installing Sphinx and the necessary Sphinx theme](#installing-sphinx-and-the-necessary-sphinx-theme)
+      * [Installing latexmk](#installing-latexmk)
+      * [Optionally installing components needed to build the PDF](#optionally-installing-components-needed-to-build-the-pdf)
+   * [Building the documentation on cheyenne](#building-the-documentation-on-cheyenne)
+* [Appendix: Editing tips](#appendix-editing-tips)
+
+.. _intro-to-the-ctsm-documentation:
+
+## Intro to the CTSM documentation
+
+The CTSM documentation is written using [reStructuredText markup language](http://www.sphinx-doc.org/en/stable/rest.html). ReStructuredText is a markup language, like HTML, markdown or latex. (See below for more resources on learning reStructuredText.)
+
+[Sphinx](http://www.sphinx-doc.org/en/stable/index.html) is a python tool for publishing reStructuredText documents in other formats such as HTML and PDF.
+
+The CTSM documentation source is stored in the `doc/source` directory of the main CTSM repository. The built documentation is stored in the gh-pages branch of the [ESCOMP/ctsm-docs repository](https://github.com/escomp/ctsm-docs). The Sphinx-generated HTML pages are accessible from URL [https://escomp.github.io/ctsm-docs/](https://escomp.github.io/ctsm-docs/)
+
+.. _what-do-i-as-a-contributor-need-to-do-to-update-the-tech-note-for-my-new-feature:
+
+## What do I, as a contributor, need to do to update the tech note for my new feature?
+
+As a contributor to CTSM, you don't necessarily need to know all of the information laid out below. If you need to update the tech note for some changes you have made, you should add or edit the necessary rst files in `doc/source/tech_note` on your CTSM branch. Then simply commit your changes to these rst files just as you would do for changes to Fortran source files, and include these rst changes in your Pull Request. Ideally these documentation changes will be on the same branch and the same Pull Request as the related source file changes, but they can also be made later, on a separate branch, and submitted to us via a separate Pull Request. In either case, the CTSM maintainers will review the documentation changes in the Pull Request and merge these changes to CTSM's master branch when ready.
+
+You do *not* need to open a Pull Request for the built documentation: one of the CTSM maintainers will rebuild the documentation later. However, if you have made more than minor edits to the documentation, we prefer if you have tested the documentation build to make sure there are no errors in the edited rst files and that the html documentation appears how you intended. But you do *not* need to send us or point us to your rebuilt documentation: One of the CTSM maintainers will build the documentation themselves to review the build.
+
+If you need to build the documentation, and/or if you need to change or add any images, you will need to keep reading for instructions on installing and using `git lfs`.
+
+.. _quick-start-to-building-the-documentation:
+
+## Quick start to building the documentation
+
+This documentation gives detailed explanations of a number of workflows that can be used in building the documentation. This section briefly summarizes a single, recommended workflow, so that you can get started quickly.
+
+First, as one-time setup, you will need to install:
+- A recent version of git
+- A recent version of python (python3.5 or later), available as `python3`
+- [Docker](https://www.docker.com/products/docker-desktop)
+- [Git LFS](https://git-lfs.github.com/), including running `git lfs install` (required if you will be adding or editing any image files, otherwise you can skip Git LFS for now) You should then launch Docker's desktop application, and run `docker pull escomp/base`.
+
+Then (if you haven't already done so), clone the CTSM repository (this example assumes that it appears in a path like this: `~/ctsm-repos/ctsm`). Check out the branch from which you want to build the documentation, then run `./bin/git-fleximod update --optional`.
+
+Then build the documentation like this:
+
+```shell
+mkdir ~/ctsm-repos/ctsm-docs
+cd ~/ctsm-repos/ctsm/doc
+./build_docs -b ~/ctsm-repos/ctsm-docs -d
+```
+
+and view it by opening the file `~/ctsm-repos/ctsm-docs/html/index.html`.
+
+.. _overview-of-the-recommended-build-method-and-alternative-methods:
+
+## Overview of the recommended build method and alternative methods
+
+The directions here assume use of a documentation build method where you are working on your local desktop / laptop, and have some basic software installed there, but use a Docker container-based method for doing the actual documentation build. Other methods are documented in an [Appendix below](#appendix-other-build-methods). We prefer the Docker-based method because it avoids the complexity of installing multiple packages on your local machine, and ensures that all people building the documentation are using the same versions of Sphinx and other utilities. The main method described here leverages this Docker container while still allowing you to remain in the comfort of your own local environment. However, some people may prefer [the more Docker-centric method described in the Appendix](#relying-more-heavily-on-the-docker-container), because it has even fewer initial installation requirements. **That solution may also work more smoothly on a Windows system, though we have run the primary method successfully on Windows after ensuring that we have an executable named python3 installed.**
+
+.. _one-time-setup-needed-for-a-given-machine:
+
+## One-time setup needed for a given machine
+
+.. _prerequisites:
+
+### Prerequisites
+
+These instructions assume that you have the following available on your machine:
+
+- A recent version of git, ideally configured according to the recommendations in <https://github.com/ESCOMP/CTSM/wiki/Recommended-git-setup#one-time-git-configuration>.
+
+- A recent version of python (python3.5 or later)
+  - Note that this must be available as `python3` (not just `python`). If your python installation did not create a `python3` command, you will need to create an alias or symbolic link so that python can be invoked via `python3`. On Windows, one developer reports success after copying `C:\Users\USERNAME\AppData\Local\Programs\Python\Python39\python.exe` to `python3.exe` (in the same location).
+
+.. _install-docker-and-download-the-required-container:
+
+### Install Docker and download the required container
+
+Download Docker to your personal desktop or laptop from [Docker](https://www.docker.com/products/docker-desktop) and follow the instructions. Then launch the Docker application.
+
+You can then obtain the necessary Docker container by running:
+
+```shell
+docker pull escomp/base
+```
+
+Note: For some versions of Docker on a Mac, Docker's CPU usage can remain at 100% even after the documentation build process exits. This seems to be connected with the issue reported in <https://github.com/docker/for-mac/issues/5164>. The issue probably arises because the `build_docs` script mounts your entire home directory in the docker container. You can work around this issue by quitting Docker when you are done building the docs, or by unchecking the option, "Use gRPC FUSE for file sharing" in Docker's preferences. However, note that unchecking that option might have some negative consequences, so you may want to re-enable it when you are done building the documentation if you use Docker for other purposes as well.
+
+.. _install-git-lfs:
+
+### Install git-lfs
+
+Git-LFS (Large File Support) is needed if you will be adding or editing any image files. **If there is even a chance that you will be doing so, it is best to go ahead and install this now, while you are thinking about it. This will prevent you from accidentally committing an image file directly to the repository, which is something we try very hard to avoid.** This is also needed for building the documentation if *not* using the Docker-based method.
+
+Follow the instructions on the [Git LFS page](https://git-lfs.github.com/) for installing git-lfs on your platform. (On a Mac using homebrew, this can be done with `brew install git-lfs`.)
+
+**Although the actual installation only needs to be done once per machine, each user who wants to use it must then run the following command to set up git-lfs for your user account on this machine:**
+
+```shell
+git lfs install
+```
+
+.. _management-of-image-files:
+
+## Management of image files
+
+**If you are adding or changing any image files, be sure you have installed git-lfs according to the [above instructions](#Install-git-lfs), including running** `git lfs install`. If you are not sure whether you have already run `git lfs install`, it is safe to rerun that command to be sure.
+
+Image files are tracked using Git LFS (Large File Support). The images are stored somewhere on GitHub, but aren't actually part of the main repository. Instead, the repository contains small text files that direct git-lfs to the appropriate storage location on GitHub.
+
+For the most part, you can remain blissfully unaware of the details of how this works. For example, if you want to add a new image file to the repository, the process is just like adding any other file to the repository, as long as you have installed git-lfs. In addition, building the documentation does not require any additional steps - again, as long as you have installed git-lfs. But here are some notes that may help you:
+
+.. _obtaining-the-image-files:
+
+### Obtaining the image files
+
+We have configured git-lfs for CTSM so that it does *not* pull down any images by default, since these images are only rarely needed. If you have cloned CTSM or updated an existing clone and want to get the latest version of the image files, you can run:
+
+```shell
+git lfs pull --exclude="" --include=""
+```
+
+Note that this is done automatically when building the documentation via the `build_docs` command, as described below.
+
+.. _seeing-what-files-are-tracked-by-git-lfs:
+
+### Seeing what files are tracked by git-lfs
+
+To see what file types (extensions) are tracked by git-lfs, run the following from within your CTSM clone:
+
+```shell
+git lfs track
+```
+
+To see every file currently being managed by git-lfs, run the following from within your CTSM clone:
+
+```shell
+git lfs ls-files --exclude="" --include=""
+```
+
+.. _adding-a-new-image-file-type:
+
+### Adding a new image file type
+
+If you want to add a new image file type, with an extension not currently being managed by git-lfs, use this process **before** adding the file to the git repository. Note that this assumes that you are in the top-level directory of your CTSM clone:
+
+```shell
+git lfs track "*.extension"
+git add .gitattributes
+git commit -m "Use git-lfs for *.extension files"
+```
+
+Then you can check that it worked by running `git lfs track`. Finally, you can add your new file with standard `git add` and `git commit` commands.
+
+.. _procedure-for-building-the-html-documentation:
+
+## Procedure for building the html documentation
+
+.. _recommended-directory-structure-for-these-directions:
+
+### Recommended directory structure for these directions
+
+In order to give concrete examples, we assume a particular directory structure for these directions: We assume you have a directory in your home directory named `ctsm-repos`, and that you clone the main CTSM repository and the ctsm-docs repository inside that directory. So you will have something like:
+
+```
+~/ctsm-repos/ctsm
+~/ctsm-repos/ctsm-docs
+```
+
+It's fine for your `ctsm` directory to be named something more specific, for example, including the branch name as is recommended [on the CTSM GitHub wiki](https://github.com/ESCOMP/CTSM/wiki/Quick-start-to-CTSM-development-with-git). It is also fine to use a different directory organization, but **if you are using the preferred, Docker container-based method, then both your main CTSM clone and the ctsm-docs clone must reside somewhere under your home directory.**
+
+.. _initial-steps-for-building-the-documentation:
+
+### Initial steps for building the documentation
+
+The following procedure assumes you have a clone of CTSM that is checked out at the branch from which you want to build documentation.
+
+Before building the documentation, you need to do the following:
+
+First, run `./bin/git-fleximod update --optional` to update your submodules; this is needed both to get `PTCLM` (which has some files referenced by the documentation build) and to get the `doc-builder` submodule that is used to do the build. **Note the use of the** `--optional` **flag here; this is needed because** `doc-builder` **is an optional submodule.**
+
+Next, if it's not already running, launch the Docker desktop application.
+
+Finally, if you haven't updated the `escomp/base` image in a while, you may want to update to the latest version with:
+
+```shell
+docker pull escomp/base
+```
+
+.. _building-a-test-version-of-the-documentation-for-your-own-review:
+
+### Building a test version of the documentation for your own review
+
+If you are just building a test version of the documentation for your own review, then you don't need to do anything with the `ctsm-docs` GitHub repository. Instead, you can create a directory according to the [above recommendations for directory structure](#Recommended-directory-structure-for-these-directions).
+
+(However, you may want to follow a procedure similar to the one [documented below for updating the official html documentation](#Updating-the-official-html-documentation): That allows you to do an incremental build rather than building the whole documentation from scratch, which can take about 1/2 hour. You can just avoid committing and pushing when following that procedure, if all you want is to preview the documentation for your own review.)
+
+If you are using the [above recommendations for directory structure](#Recommended-directory-structure-for-these-directions), do the following from the `doc` directory of your ctsm clone:
+
+```shell
+mkdir ~/ctsm-repos/ctsm-docs
+./build_docs -b ~/ctsm-repos/ctsm-docs -d
+```
+
+(where the `-d` flag instructs `build_docs` to use the `escomp/base` Docker container to do the build).
+
+.. _previewing-the-built-documentation:
+
+### Previewing the built documentation
+
+You can then view your changes in a local browser window using a command like one of these:
+
+```shell
+open ~/ctsm-repos/ctsm-docs/html/index.html
+firefox ~/ctsm-repos/ctsm-docs/html/index.html
+konqueror ~/ctsm-repos/ctsm-docs/html/index.html
+```
+
+**Note that the version dropdown menu will not work in these local previews.**
+
+.. _updating-the-official-html-documentation:
+
+### Updating the official html documentation
+
+If you want to update the official html documentation, follow the below procedure. (You can also use this procedure if you only intend to build a test version for your own review. This can be helpful because this procedure allows for an incremental build rather than building the entire documentation from scratch.) First clone the ctsm-docs repository to somewhere outside of your main CTSM repository. Here we'll assume that you are using the [above recommendations for directory structure](#Recommended-directory-structure-for-these-directions).
+
+```shell
+cd ~/ctsm-repos
+git clone https://github.com/ESCOMP/ctsm-docs.git
+```
+
+Or, if you already have a copy of ctsm-docs, make sure it is up-to-date as follows:
+
+```shell
+cd ~/ctsm-repos/ctsm-docs
+git checkout -- .
+git pull
+```
+
+Next, `cd` to the `doc` directory of your main CTSM clone:
+
+```shell
+cd ~/ctsm-repos/ctsm/doc
+```
+
+Then, to perform an incremental build (only updating files that need to be updated), run the following. **Note that the following assumes you are building the documentation for the master branch; if you are building the documentation for one of the release branches, replace** `master` **with the appropriate version.**
+
+```shell
+./build_docs -b ~/ctsm-repos/ctsm-docs/versions/master -d
+```
+
+(where the `-d` flag instructs `build_docs` to use the `escomp/base` Docker container to do the build).
+
+However, if there have been significant changes to the documentation since the last documentation build, and you are intending to push the new build back to GitHub, it's probably best to first clean out the old build in order to remove any no-longer-relevant files. The downside of doing this is that the full documentation rebuild will take about 1/2 hour:
+
+```shell
+./build_docs -b ~/ctsm-repos/ctsm-docs/versions/master -d -c
+```
+
+(where the `-c` flag instructs `build_docs` to first run `make clean` in the specified directory).
+
+You can preview the documentation as noted [above](#Previewing-the-built-documentation), but now the `index.html` file will be in `~/ctsm-repos/ctsm-docs/versions/master/html/index.html`. **Note that the version dropdown menu appear when you preview the documentation locally, but if you haven't built all the versions, some version links will lead to nonexistent files.**
+
+Then commit and push the rebuilt documentation as follows:
+
+```shell
+cd ~/ctsm-repos/ctsm-docs
+git add .
+git commit -m "YOUR MESSAGE"
+git push origin gh-pages
+```
+
+**Note if you're using a Windows machine: You may see a lot of warnings like** `warning: LF will be replaced by CRLF in path/to/some/file`. **These seem safe to ignore in this case.**
+
+Within a few minutes, the official documentation at [https://escomp.github.io/ctsm-docs/](https://escomp.github.io/ctsm-docs/) will be updated automatically. Note that you can also fork the ctsm-docs repository and push the gh-pages branch to your fork to allow others to preview the documentation before you overwrite the official documentation.
+
+.. _dealing-with-errors:
+
+### Dealing with errors
+
+.. _inputoutput-error:
+
+#### Input/output error
+
+Some people have reported an error like this:
+
+```shell
+Exception occurred:
+  File "/usr/lib64/python3.6/shutil.py", line 205, in copystat
+    follow_symlinks=follow)
+OSError: [Errno 5] Input/output error
+The full traceback has been saved in /tmp/sphinx-err-hhpnw_mt.log, if you want to report the issue to the developers.
+```
+
+Rerunning the build command will restart it where it left off, and our experience is that that will let you complete the build - though you may need to rerun the build command a few times before it finally finishes successfully.
+
+.. _adding-a-new-version:
+
+### Adding a new version
+
+If you want to add a new version of the built documentation, so that it appears in the dropdown menu, follow this process:
+
+- In the ctsm-docs repository, create a new directory under `versions` with the name of the new version. Our convention is that this name should be the same as the name of the branch in the main CTSM repository that contains this version of the documentation source. 
+- In the ctsm-docs repository, add a line in the file `versions/versions.json`. Note that each line is a colon-delimited mapping; the name before the colon is the directory name (i.e., the name of the directory you just created, which is the same as the branch name in the CTSM repository), and the name after the colon is the version name that you want to appear in the dropdown menu. Make sure there is a comma at the end of every line except for the last in this file.
+- In the main CTSM repository, check out the branch from which you want to build the documentation. 
+- In the main CTSM repository, edit the file `doc/source/conf.py`: edit the `version` and `release` variables (these should probably be the same as the version name that will appear in the dropdown menu) and anything else that needs to be changed for this release (`copyright`, etc.) 
+- Build the documentation as described above, being sure to specify your new directory for `BUILDDIR`.
+
+.. _building-a-pdf-of-the-tech-note:
+
+## Building a pdf of the tech note
+
+To build a pdf of the tech note (note that we currently do not support building a pdf of the user's guide), do the following from the `doc` directory of your CTSM clone:
+
+```shell
+mkdir ~/ctsm-repos/ctsm-docs-pdf
+./build_docs -b ~/ctsm-repos/ctsm-docs-pdf -d -t latexpdf
+```
+
+The pdf will appear at `~/ctsm-repos/ctsm-docs-pdf/latex/clmdoc.pdf`.
+
+.. _resources-for-learning-markup-with-restructuredtext-and-using-sphinx:
+
+## Resources for learning markup with reStructuredText and using Sphinx.
+
+* [reStructuredText Primer](http://www.sphinx-doc.org/en/stable/rest.html)
+* [ReST Syntax](https://wiki.typo3.org/ReST_Syntax)
+* [Sphinx (including how to get Sphinx)](http://www.sphinx-doc.org/en/stable/)
+* [reStructured syntax](http://thomas-cokelaer.info/tutorials/sphinx/rest_syntax.html#tables)
+
+.. _appendix-other-build-methods:
+
+## Appendix: Other build methods
+
+.. _running-build_docs-from-all-of-these-methods:
+
+### Running build_docs from all of these methods
+
+With all of these alternative methods, you can still use `build_docs` commands similar to those given elsewhere in these instructions, **but without the** `-d` **argument**.
+
+.. _relying-more-heavily-on-the-docker-container:
+
+### Relying more heavily on the Docker container
+
+The above instructions still require you to have recent versions of python, git and git-lfs. Alternatively, you can use a method that relies more heavily on the Docker container, avoiding the need for other software to be installed. **This is a very reasonable alternative method, which some people may prefer - especially if you are already comfortable using Docker containers.**
+
+To start, [follow the instructions for installing Docker and downloading the required container](#Install-Docker-and-download-the-required-container). Then use the instructions below.
+
+.. _launching-the-docker-image:
+
+#### Launching the Docker image
+
+Assuming that both your main CTSM repository and ctsm-docs repository are cloned somewhere within your home directory, you can launch the Docker image like this:
+
+```shell
+docker run -i -t --rm -v ${HOME}:/home/user/mounted_home escomp/base
+```
+
+This tells docker to *run* the container (`docker run`), interactively (`-i`) with a terminal (`-t`), to clean up the container after running (`--rm`), and most importantly, to map your local `${HOME}` directory into the `/home/user/mounted_home` directory inside the container (`-v ${HOME}:/home/user/mounted_home`).
+
+After running this command, you will see a command prompt, but now you will be in the Docker environment. This means:
+- You will be able to see directories and files contained in your local `${HOME}` directory, but nothing else. `${HOME}/mounted_home` in the Docker environment refers to `${HOME}` in your native system environment. Changed or added files here will be visible in your native system, in the appropriate subdirectory of your `${HOME}` directory. This will become important later in these directions, since you will view the generated documentation from your native environment.
+- Any commands you run from this environment will use the commands bundled with the Docker image, *not* the commands in your native system environment.
+
+When you are done using this Docker image, simply type `exit` from the command prompt.
+
+For far more information on running Docker containers, you can look at [Docker's documentation](https://docs.docker.com/engine/reference/run/).
+
+.. _building-the-documentation:
+
+#### Building the documentation
+
+You can use `build_docs` commands like those given elsewhere in these instructions, **but without the** `-d` **argument** (the `-d` argument launches a new Docker image, but in this case, you are already inside a Docker image, so this is unnecessary). Keep in mind that you will need to specify the path to the documentation build directory according to the Docker file system, not your native file system.
+
+.. _viewing-the-built-documentation:
+
+#### Viewing the built documentation
+
+You can view the built documentation [as described above](#Previewing-the-built-documentation). However, in order to find the `index.html` file, keep in mind the mapping between directories in Docker's environment and those in your native environment.
+
+.. _committing-to-git-repositories:
+
+#### Committing to git repositories
+
+Any local git configuration information is *not* picked up by the Docker image. Therefore, if you want to make any git commits from the Docker terminal session, you will need to do one of the following:
+- After doing the `docker run` command as above, copy `/home/user/mounted_home/.gitconfig` to `/home/user/.gitconfig`.
+- Or run the `git config` command to set your name and email, as described [here](https://github.com/ESCOMP/CTSM/wiki/Recommended-git-setup#required-settings)
+
+.. _installing-required-software-on-your-desktoplaptop-instructions-for-mac:
+
+### Installing required software on your desktop/laptop (instructions for Mac)
+
+If you choose not to use the Docker-based method described above, you can instead install Sphinx and some related packages locally. **We do not recommend this method, because it can be more challenging to set up and maintain than the method described above. In addition, the instructions here are not regularly tested, so may no longer work. Finally, the use of this method can mean that your Sphinx version differs from the one used to generate the official documentation, which can potentially cause problems.** However, if you cannot use the Docker method for some reason, then you can try this alternative.
+
+.. _prerequisites--assumptions:
+
+#### Prerequisites / assumptions
+
+The following documentation assumes that you have the following available on your machine:
+
+- A recent version of git, ideally configured according to the recommendations in <https://github.com/ESCOMP/CTSM/wiki/Recommended-git-setup#one-time-git-configuration>.
+
+- A recent version of python (python3.5 or later)
+
+- If using a Mac, the [Homebrew package manager](https://brew.sh/)
+
+.. _installing-sphinx-and-the-necessary-sphinx-theme:
+
+#### Installing Sphinx and the necessary Sphinx theme
+
+Sphinx and the necessary Sphinx theme are python packages that can be installed with `pip install`:
+
+```shell
+pip install sphinx
+pip install git+https://github.com/esmci/sphinx_rtd_theme.git@version-dropdown-with-fixes
+```
+
+For more details on installing Sphinx, see the [Sphinx installation docs](http://www.sphinx-doc.org/en/stable/install.html).
+
+*You may then need to update your PATH environment variable to include the path to the* `sphinx-build` *script.*
+
+.. _installing-latexmk:
+
+#### Installing latexmk
+
+`latexmk` is needed both for building the PDF and for creating the equations in the html documentation. On a Mac using homebrew, this can be installed with:
+
+```shell
+brew cask install mactex
+```
+
+Note that you will need to open a new terminal window for the latexmk tool to be added to your path (it is in `/Library/TeX/texbin/latexmk`, which should have been added to your path by the above `brew` command).
+
+.. _optionally-installing-components-needed-to-build-the-pdf:
+
+#### Optionally installing components needed to build the PDF
+
+If you want to build the PDF (not just the html web pages), you *may* also need rst2pdf. This can be installed with:
+
+```shell
+pip install rst2pdf
+```
+
+.. _building-the-documentation-on-cheyenne:
+
+### Building the documentation on cheyenne
+
+Finally, although we haven't figured out a way to view the built documentation on cheyenne, you can test the build there, and then transfer the files to your local machine for viewing.
+
+To do so, first ensure that you are using the `git` and `python` modules on cheyenne rather than the default system versions, by doing `module load git` and `module load python`. (Note that the default git module has `git lfs` bundled with it.)
+
+Then, the first time you build the documentation, do this one-time setup:
+
+```shell
+pip install --user sphinx
+pip install --user sphinxcontrib-programoutput
+pip install --user git+https://github.com/esmci/sphinx_rtd_theme.git@version-dropdown-with-fixes
+```
+
+and add the following to your `.bashrc` or similar file if using bash:
+
+```bash
+export PATH=/glade/u/home/$USER/.local/bin:$PATH
+```
+
+or, if you're using tcsh, add to your `.tcshrc`:
+
+```tcsh
+setenv PATH /glade/u/home/$USER/.local/bin:$PATH
+```
+
+.. _appendix-editing-tips:
+
+## Appendix: Editing tips
+- Please don't add manual line breaks when writing text, as this harms searchability. (Note that it's fine to do this in multi-line `:math:` blocks.) For more information, see [text-linebreaks](https://github.com/ESCOMP/CTSM/issues/2135#issuecomment-1764999337).
+- You can write the degree symbol ° with Opt-Shift-8 on Mac or Alt+0176 on Windows. Note that this is different from the [masculine ordinal indicator](https://en.wikipedia.org/wiki/Ordinal_indicator) º (typed with Opt-0 on Mac). This is much cleaner and more searchable than using RestructuredText syntax to write a superscript-o!
+- Whenever possible, please give equations meaningful labels. E.g., for [eq. 2.26.2](https://escomp.github.io/ctsm-docs/versions/release-clm5.0/html/tech_note/Crop_Irrigation/CLM50_Tech_Note_Crop_Irrigation.html#equation-25-2), `:label: gdds_for_cfts`) instead of numbers (`:label: 25.2`). Numeric labels become obsolete—as you can see in that example!—whenever new equations and/or sections are added. (Note that the equation numbering in the rendered HTML is automatic.)
+- Tables defined with the [`:table:` directive](https://docutils.sourceforge.io/docs/ref/rst/directives.html#table) can be annoying because they're very sensitive to the cells inside them being precisely the right widths, as defined by the first `====` strings. If you don't get the widths right, you'll see "Text in column margin" errors. Instead, define your tables using the [`:list-table:`](https://docutils.sourceforge.io/docs/ref/rst/directives.html#list-table) directive.
\ No newline at end of file
diff --git a/doc/source/users_guide/working-with-documentation/caveats-for-working-with-markdown.md b/doc/source/users_guide/working-with-documentation/caveats-for-working-with-markdown.md
new file mode 100644
index 0000000000..843e0630f4
--- /dev/null
+++ b/doc/source/users_guide/working-with-documentation/caveats-for-working-with-markdown.md
@@ -0,0 +1,26 @@
+.. _caveats-for-working-with-markdown:
+
+# Caveats for working with Markdown
+
+.. _cross-references:
+
+## Cross-references
+You can [link to section headings](#cross-references) with the `[link to section headings](#cross-references)` format, but the Sphinx compiler will complain. To fix that, you will need to also add a reStructuredText label like `.. _cross-references:` above the heading, with blank lines before and after it. This rST label will appear if you render the .md file as pure Markdown (e.g., in VSCode's Markdown preview pane), but it will be invisible on the final generated webpage.
+
+If you forget to surround the label with blank lines, you will get errors like "Explicit markup ends without a blank line; unexpected unindent [docutils]" that often point to lines far away from the actual problem.
+
+## Inline math
+(Note that parts of this section will be rendered incorrectly by Markdown parsers!)
+
+Inline math can't be achieved with the typical Markdown syntax of just surrounding your expression with dollar signs. Instead, you need to surround THAT with backticks. So to render `$y = mx + b$`, we can't do
+```
+So to render $y = mx + b$, ...
+```
+because we'd just see $y = mx + b$ on the generated webpage. Instead, we do
+```
+So to render `$y = mx + b$`, ...
+```
+We could also use rST's syntax like so:
+```
+So to render :math:`y = mx + b`, ...
+```
\ No newline at end of file
diff --git a/doc/source/users_guide/working-with-documentation/docs-intro-and-recommended.md b/doc/source/users_guide/working-with-documentation/docs-intro-and-recommended.md
new file mode 100644
index 0000000000..04fac2b164
--- /dev/null
+++ b/doc/source/users_guide/working-with-documentation/docs-intro-and-recommended.md
@@ -0,0 +1,42 @@
+.. _docs-intro-and-recommended:
+
+# Introduction to working with the CTSM documentation
+
+## Documentation source files
+The CTSM documentation is built from files in the `doc/source/tech_note/` and `doc/source/users_guide/` directories. These files are written in a mixture of what are called "markup languages." You may already be familiar—for better or for worse—with the LaTeX markup language. Fortunately, our documentation is simpler than that. It was originally written entirely in [reStructuredText](http://www.sphinx-doc.org/en/stable/rest.html), and it still mostly is, as you can tell by the predominance of .rst files. However, it's also possible to write Markdown documents (.md), which is nice because it's a much simpler and more widespread format (although see :ref:`caveats-for-working-with-markdown`). If you've formatted text on GitHub, for instance, you've used Markdown.
+
+.. _editing-the-documentation:
+
+## Editing the documentation
+Editing the documentation is as simple as opening the source file for the page you want to edit, then changing text. Make sure to use either reStructuredText or Markdown syntax, depending on the file's extension (.rst or .md, respectively).
+
+If you're confident in your changes, or you're _not_ confident in your ability to preview and test the documentation (see [Building the documentation (recommended method)](#building-the-documentation-recommended-method) below), all you need to do is commit your changes and submit a pull request to the [CTSM GitHub repo](https://github.com/ESCOMP/CTSM). Automated testing will check the updated documentation for any errors, and a CTSM software engineer will review your PR. If everything looks good, they will merge it into the codebase and update the website.
+
+.. _building-the-documentation-recommended-method:
+
+## Building the documentation (recommended method)
+We strongly suggest building the documentation on your personal computer before submitting a pull request, so that you can preview what your changes will look like. The recommended way to do this is using the `doc-builder` tool in conjunction with a "containerized" version of some required software.
+
+### Required software
+You will need [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [Git LFS](https://git-lfs.com/), and [Docker Desktop](https://www.docker.com/products/docker-desktop/) installed on your machine. In addition, you will need a decently modern installation of Python available from the command line as `python3`. We test the most with Python 3.13.2 (available in the `ctsm_pylib` conda environment; see :ref:`using-ctsm-pylib`), but any version 3.7 or later should work (and maybe earlier). You can do `python3 --version` on the command line to check your version.
+
+### Directories
+You will need a place to build the documentation. It's fine if that doesn't exist; the build tool will make it for you. Alternatively, you can clone the [ctsm-docs](https://github.com/ESCOMP/ctsm-docs) repository and build there. The only restriction is that, at least for the recommended method described here, **your build directory must be somewhere in your user home directory**, which we represent as `$HOME`. The instructions here assume you want to do your build in `$HOME/path/to/build-dir/`.
+
+Your CTSM clone, from which you're building the documentation, also needs to be somewhere in your user home directory.
+
+### Building a preview
+Ensure that Docker Desktop is running. Then all you need to do is
+```shell
+cd doc
+./build_docs -b $HOME/path/to/build-dir -d
+```
+
+(Do `./build_docs --help` for more information and options.)
+
+You can then open the documentation in a web browser by browsing to `$HOME/path/to/build-dir/html/` and opening `index.html`.
+
+Note that there is a menu in the lower left of the webpage that lets readers switch between different versions of the documentation. The links to versions in this menu will not work when using the build command given above. If you wish to preview this version switching functionality, or you're building the docs in the process of actually updating the website, see :ref:`building-docs-multiple-versions`.
+
+## Further reading
+More complicated instructions and alternative methods for building the documentation can be found in :ref:`overview-of-the-recommended-build-method-and-alternative-methods`.
diff --git a/doc/source/users_guide/working-with-documentation/index.rst b/doc/source/users_guide/working-with-documentation/index.rst
new file mode 100644
index 0000000000..383fa52e80
--- /dev/null
+++ b/doc/source/users_guide/working-with-documentation/index.rst
@@ -0,0 +1,16 @@
+.. include:: ../substitutions.rst
+
+.. _working-with-docs:
+
+#######################################
+Working with CTSM Documentation
+#######################################
+
+.. toctree::
+   :maxdepth: 2
+
+   docs-intro-and-recommended.md
+   building-docs-multiple-versions.md
+   caveats-for-working-with-markdown.md
+   building-docs-original-wiki.md
+
diff --git a/python/conda_env_ctsm_py.yml b/python/conda_env_ctsm_py.yml
index 8a951bb3f6..7c13b34eba 100644
--- a/python/conda_env_ctsm_py.yml
+++ b/python/conda_env_ctsm_py.yml
@@ -16,6 +16,11 @@ dependencies:
   - black=25.1.0
   - cartopy=0.24.0
   - matplotlib=3.10.1
+  - pip=25.0.1
+
+  # For building docs
+  - pip:
+    - -r ../doc/ctsm-docs_container/requirements.txt
 
   # Used in ctsm_postprocessing repo
   - pytest=8.3.5
diff --git a/share b/share
index a30c62710d..14338bef3f 160000
--- a/share
+++ b/share
@@ -1 +1 @@
-Subproject commit a30c62710d0c4e5a8ea9a5b780ac5b1b83677d55
+Subproject commit 14338bef3fa604d49160e376257264db1d3313e5
diff --git a/src/biogeophys/LakeFluxesMod.F90 b/src/biogeophys/LakeFluxesMod.F90
index fb5f723839..93b2e30069 100644
--- a/src/biogeophys/LakeFluxesMod.F90
+++ b/src/biogeophys/LakeFluxesMod.F90
@@ -8,6 +8,8 @@ module LakeFluxesMod
   ! !USES
   use shr_kind_mod         , only : r8 => shr_kind_r8
   use shr_log_mod          , only : errMsg => shr_log_errMsg
+  use abortutils           , only : endrun
+  use clm_varctl           , only : iulog
   use decompMod            , only : bounds_type
   use atm2lndType          , only : atm2lnd_type
   use EnergyFluxType       , only : energyflux_type
@@ -41,6 +43,10 @@ module LakeFluxesMod
       real(r8) :: wind_min ! Minimum wind speed at the atmospheric forcing height (m/s)
   end type params_type
   type(params_type), private ::  params_inst
+
+
+  character(len=*), parameter, private :: sourcefile = &
+  __FILE__
   !-----------------------------------------------------------------------
 
 contains
@@ -96,6 +102,7 @@ subroutine LakeFluxes(bounds, num_lakec, filter_lakec, num_lakep, filter_lakep,
     use clm_varcon          , only : beta_param, nu_param, b1_param, b4_param
     use clm_varcon          , only : meier_param1, meier_param2, meier_param3
     use clm_varctl          , only : use_lch4, z0param_method, use_z0m_snowmelt
+    use clm_varctl          , only : snow_thermal_cond_lake_method
     use LakeCon             , only : betavis, z0frzlake, tdmax, emg_lake
     use LakeCon             , only : lake_use_old_fcrit_minz0
     use LakeCon             , only : minz0lake, cur0, cus, curm, fcrit
@@ -480,7 +487,20 @@ subroutine LakeFluxes(bounds, num_lakec, filter_lakec, num_lakep, filter_lakep,
             else
                !Need to calculate thermal conductivity of the top snow layer
                bw = (h2osoi_ice(c,jtop(c))+h2osoi_liq(c,jtop(c)))/dz(c,jtop(c))
-               tksur(c) = tkair + (7.75e-5_r8 *bw + 1.105e-6_r8*bw*bw)*(tkice-tkair)
+               select case (snow_thermal_cond_lake_method)
+               case ('Jordan1991')
+                  tksur(c) = tkair + (7.75e-5_r8 *bw + 1.105e-6_r8*bw*bw)*(tkice-tkair)
+               case ('Sturm1997')
+                  if (bw <= 156) then
+                     tksur(c) = 0.023 + 0.234*(bw/1000)
+                  else
+                     tksur(c) = 0.138 - 1.01*(bw/1000) +(3.233*((bw/1000)*(bw/1000)))
+                  end if
+               case default
+                  write(iulog,*) ' ERROR: unknown snow_thermal_cond_lake_method value: ', snow_thermal_cond_lake_method
+                  call endrun(msg=errMsg(sourcefile, __LINE__))
+               end select
+
                tsur(c) = t_soisno(c,jtop(c))
             end if
 
diff --git a/src/biogeophys/LakeTemperatureMod.F90 b/src/biogeophys/LakeTemperatureMod.F90
index 280020b6ef..c46a03a90c 100644
--- a/src/biogeophys/LakeTemperatureMod.F90
+++ b/src/biogeophys/LakeTemperatureMod.F90
@@ -9,6 +9,8 @@ module LakeTemperatureMod
   !
   ! !USES
   use shr_kind_mod      , only : r8 => shr_kind_r8
+  use abortutils        , only : endrun
+  use shr_log_mod       , only : errMsg => shr_log_errMsg
   use decompMod         , only : bounds_type
   use ch4Mod            , only : ch4_type
   use EnergyFluxType    , only : energyflux_type
@@ -19,6 +21,7 @@ module LakeTemperatureMod
   use WaterFluxBulkType     , only : waterfluxbulk_type
   use WaterStateBulkType    , only : waterstatebulk_type
   use WaterDiagnosticBulkType    , only : waterdiagnosticbulk_type
+  use clm_varctl        , only : iulog
   use ColumnType        , only : col                
   use PatchType         , only : patch                
   !    
@@ -117,7 +120,7 @@ subroutine LakeTemperature(bounds, num_lakec, filter_lakec, num_lakep, filter_la
     use clm_time_manager   , only : get_step_size_real
     use clm_varcon         , only : hfus, cpliq, cpice, tkwat, tkice, denice
     use clm_varcon         , only : vkc, grav, denh2o, tfrz, cnfac
-    use clm_varctl         , only : iulog, use_lch4
+    use clm_varctl         , only : use_lch4
     !
     ! !ARGUMENTS:
     type(bounds_type)      , intent(in)    :: bounds	  
@@ -1085,6 +1088,7 @@ subroutine SoilThermProp_Lake (bounds,  num_lakec, filter_lakec, tk, cv, tktopso
      use clm_varcon  , only : denh2o, denice, tfrz, tkwat, tkice, tkair
      use clm_varcon  , only : cpice,  cpliq, thk_bedrock, csol_bedrock
      use clm_varpar  , only : nlevsno, nlevsoi, nlevgrnd
+     use clm_varctl  , only : snow_thermal_cond_lake_method
      !
      ! !ARGUMENTS:
      type(bounds_type)      , intent(in)  :: bounds  
@@ -1181,7 +1185,20 @@ subroutine SoilThermProp_Lake (bounds,  num_lakec, filter_lakec, tk, cv, tktopso
              ! Only examine levels from snl(c)+1 -> 0 where snl(c) < 1
              if (snl(c)+1 < 1 .AND. (j >= snl(c)+1) .AND. (j <= 0)) then
                 bw = (h2osoi_ice(c,j)+h2osoi_liq(c,j))/dz(c,j)
-                thk(c,j) = tkair + (7.75e-5_r8 *bw + 1.105e-6_r8*bw*bw)*(tkice-tkair)
+                select case (snow_thermal_cond_lake_method)
+                case ('Jordan1991')
+                   thk(c,j) = tkair + (7.75e-5_r8 *bw + 1.105e-6_r8*bw*bw)*(tkice-tkair)
+                case ('Sturm1997')
+                   if (bw <= 156) then 
+                      thk(c,j) = 0.023 + 0.234*(bw/1000) 
+                   else
+                      thk(c,j) = 0.138 - 1.01*(bw/1000) +(3.233*((bw/1000)*(bw/1000))) 
+                   end if
+                case default
+                   write(iulog,*) ' ERROR: unknown snow_thermal_cond_lake_method value: ', snow_thermal_cond_lake_method
+                   call endrun(msg=errMsg(sourcefile, __LINE__))
+                end select
+
              end if
 
           end do
diff --git a/src/biogeophys/SoilTemperatureMod.F90 b/src/biogeophys/SoilTemperatureMod.F90
index 11b84e49d8..2819894868 100644
--- a/src/biogeophys/SoilTemperatureMod.F90
+++ b/src/biogeophys/SoilTemperatureMod.F90
@@ -11,6 +11,7 @@ module SoilTemperatureMod
   use shr_infnan_mod          , only : nan => shr_infnan_nan, assignment(=)
   use decompMod               , only : bounds_type
   use abortutils              , only : endrun
+  use shr_log_mod             , only : errMsg => shr_log_errMsg
   use perf_mod                , only : t_startf, t_stopf
   use clm_varctl              , only : iulog
   use UrbanParamsType         , only : urbanparams_type
@@ -619,12 +620,11 @@ subroutine SoilThermProp (bounds, num_urbanc, filter_urbanc, num_nolakec, filter
     ! flux from the interface to the node j+1.
     !
     ! !USES:
-    use shr_log_mod     , only : errMsg => shr_log_errMsg
     use clm_varpar      , only : nlevsno, nlevgrnd, nlevurb, nlevsoi, nlevmaxurbgrnd
     use clm_varcon      , only : denh2o, denice, tfrz, tkwat, tkice, tkair, cpice,  cpliq, thk_bedrock, csol_bedrock
     use landunit_varcon , only : istice, istwet
     use column_varcon   , only : icol_roof, icol_sunwall, icol_shadewall, icol_road_perv, icol_road_imperv
-    use clm_varctl      , only : iulog, snow_thermal_cond_method
+    use clm_varctl      , only : iulog, snow_thermal_cond_method, snow_thermal_cond_glc_method
     !
     ! !ARGUMENTS:
     type(bounds_type)      , intent(in)    :: bounds 
@@ -649,8 +649,6 @@ subroutine SoilThermProp (bounds, num_urbanc, filter_urbanc, num_nolakec, filter
     real(r8) :: fl                        ! volume fraction of liquid or unfrozen water to total water
     real(r8) :: satw                      ! relative total water content of soil.
     real(r8) :: zh2osfc
-
-    character(len=*),parameter :: subname = 'SoilThermProp'
     !-----------------------------------------------------------------------
 
     call t_startf( 'SoilThermProp' )
@@ -742,24 +740,46 @@ subroutine SoilThermProp (bounds, num_urbanc, filter_urbanc, num_nolakec, filter
             ! Only examine levels from snl(c)+1 -> 0 where snl(c) < 1
             if (snl(c)+1 < 1 .AND. (j >= snl(c)+1) .AND. (j <= 0)) then  
                bw(c,j) = (h2osoi_ice(c,j)+h2osoi_liq(c,j))/(frac_sno(c)*dz(c,j))
-               select case (snow_thermal_cond_method)
-               case ('Jordan1991')
-                  thk(c,j) = tkair + (7.75e-5_r8 *bw(c,j) + 1.105e-6_r8*bw(c,j)*bw(c,j))*(tkice-tkair)
-               case ('Sturm1997')
-                  ! Implemented by Vicky Dutch (VRD), Nick Rutter, and
-                  ! Leanne Wake (LMW)
-                  ! https://tc.copernicus.org/articles/16/4201/2022/
-                  ! Code provided by Adrien Dams to Will Wieder
-                  if (bw(c,j) <= 156) then !LMW or 0.156 ?
-                     thk(c,j) = 0.023 + 0.234*(bw(c,j)/1000) !LMW - units changed by VRD
-                  else !LMW
-                     thk(c,j) = 0.138 - 1.01*(bw(c,j)/1000) +(3.233*((bw(c,j)/1000)*(bw(c,j)/1000))) ! LMW Sturm I think
-                  end if
-               case default
-                  write(iulog,*) subname//' ERROR: unknown snow_thermal_cond_method value: ', snow_thermal_cond_method
-                  call endrun(msg=errMsg(sourcefile, __LINE__))
-               end select
-            end if
+               l = col%landunit(c)
+
+               ! Select method over glacier land unit 
+               if (lun%itype(l) == istice) then
+                  select case (snow_thermal_cond_glc_method)
+                  ! TODO, this code duplication isn't ideal and should likely be in it's own subroutine
+                  case('Jordan1991')
+                     thk(c,j) = tkair + (7.75e-5_r8 *bw(c,j) + 1.105e-6_r8*bw(c,j)*bw(c,j))*(tkice-tkair)
+                  case ('Sturm1997')
+                     if (bw(c,j) <= 156) then !LMW or 0.156 ?
+                        thk(c,j) = 0.023 + 0.234*(bw(c,j)/1000) !LMW - units changed by VRD
+                     else 
+                        thk(c,j) = 0.138 - 1.01*(bw(c,j)/1000) +(3.233*((bw(c,j)/1000)*(bw(c,j)/1000))) 
+                     end if
+                  case default
+                     write(iulog,*) ' ERROR: unknown snow_thermal_cond_glc_method value: ', snow_thermal_cond_glc_method
+                     call endrun(msg=errMsg(sourcefile, __LINE__))
+                  end select
+
+               else
+                  select case (snow_thermal_cond_method)
+                  case ('Jordan1991')
+                     thk(c,j) = tkair + (7.75e-5_r8 *bw(c,j) + 1.105e-6_r8*bw(c,j)*bw(c,j))*(tkice-tkair)
+                  case ('Sturm1997')
+                     ! Implemented by Vicky Dutch (VRD), Nick Rutter, and
+                     ! Leanne Wake (LMW)
+                     ! https://tc.copernicus.org/articles/16/4201/2022/
+                     ! See also https://tc.copernicus.org/articles/19/1539/2025/
+                     ! Code provided by Adrien Dams to Will Wieder
+                     if (bw(c,j) <= 156) then !LMW or 0.156 ?
+                        thk(c,j) = 0.023 + 0.234*(bw(c,j)/1000) !LMW - units changed by VRD
+                     else 
+                        thk(c,j) = 0.138 - 1.01*(bw(c,j)/1000) +(3.233*((bw(c,j)/1000)*(bw(c,j)/1000))) 
+                     end if
+                  case default
+                     write(iulog,*) ' ERROR: unknown snow_thermal_cond_method value: ', snow_thermal_cond_method
+                     call endrun(msg=errMsg(sourcefile, __LINE__))
+                  end select
+               end if ! close land unit if statement 
+          end if
 
          end do
       end do
diff --git a/src/main/clm_varctl.F90 b/src/main/clm_varctl.F90
index 61ae7c4eb3..41978ae695 100644
--- a/src/main/clm_varctl.F90
+++ b/src/main/clm_varctl.F90
@@ -238,6 +238,8 @@ module clm_varctl
   character(len=64), public :: snow_cover_fraction_method
   ! which snow thermal conductivity parameterization to use
   character(len=25), public :: snow_thermal_cond_method
+  character(len=25), public :: snow_thermal_cond_glc_method
+  character(len=25), public :: snow_thermal_cond_lake_method
 
   ! atmospheric CO2 molar ratio (by volume) (umol/mol)
   real(r8), public :: co2_ppmv     = 355._r8            !
diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
index 8c78194e0a..6d363a9a6e 100644
--- a/src/main/controlMod.F90
+++ b/src/main/controlMod.F90
@@ -207,7 +207,8 @@ subroutine control_init(dtime)
          create_crop_landunit, nsegspc, co2_ppmv, &
          albice, soil_layerstruct_predefined, soil_layerstruct_userdefined, &
          soil_layerstruct_userdefined_nlevsoi, use_subgrid_fluxes, &
-         snow_thermal_cond_method, snow_cover_fraction_method, &
+         snow_thermal_cond_method, snow_thermal_cond_glc_method, &
+         snow_thermal_cond_lake_method, snow_cover_fraction_method, &
          irrigate, run_zero_weight_urban, all_active, &
          crop_fsat_equals_zero, for_testing_run_ncdiopio_tests, &
          for_testing_use_second_grain_pool, for_testing_use_repr_structure_pool, &
@@ -926,6 +927,8 @@ subroutine control_spmd()
     call mpi_bcast (nsegspc, 1, MPI_INTEGER, 0, mpicom, ier)
     call mpi_bcast (use_subgrid_fluxes , 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (snow_thermal_cond_method, len(snow_thermal_cond_method), MPI_CHARACTER, 0, mpicom, ier)
+    call mpi_bcast (snow_thermal_cond_glc_method, len(snow_thermal_cond_glc_method), MPI_CHARACTER, 0, mpicom, ier)
+    call mpi_bcast (snow_thermal_cond_lake_method, len(snow_thermal_cond_lake_method), MPI_CHARACTER, 0, mpicom, ier)
     call mpi_bcast (snow_cover_fraction_method , len(snow_cover_fraction_method), MPI_CHARACTER, 0, mpicom, ier)
     call mpi_bcast (z0param_method , len(z0param_method), MPI_CHARACTER, 0, mpicom, ier)
     call mpi_bcast (use_z0m_snowmelt, 1, MPI_LOGICAL, 0, mpicom, ier)