diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000
index e2cf705f5b..5b4d2b2564 100644
--- a/ocean_only/global_ALE/layer/available_diags.000000
+++ b/ocean_only/global_ALE/layer/available_diags.000000
@@ -5259,35 +5259,35 @@
     ! cell_methods: z_l:sum
 "ocean_model", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model", "Kd_BBL"  [Used]
     ! long_name: Bottom Boundary Layer Diffusivity
diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000
index eeee8811fc..c0a8b08cc5 100644
--- a/ocean_only/global_ALE/z/available_diags.000000
+++ b/ocean_only/global_ALE/z/available_diags.000000
@@ -5823,35 +5823,35 @@
     ! cell_methods: z_l:sum
 "ocean_model", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model", "Kd_BBL"  [Used]
     ! long_name: Bottom Boundary Layer Diffusivity
diff --git a/src/MOM6 b/src/MOM6
index 9f8a4527b8..8546837acd 160000
--- a/src/MOM6
+++ b/src/MOM6
@@ -1 +1 @@
-Subproject commit 9f8a4527b8c30ab01d3b250fb80e91b92e6f55b9
+Subproject commit 8546837acd9c5699e8b0d76bd930b258dab16e51