diff --git a/driver_cpl/cime_config/config_component.xml b/driver_cpl/cime_config/config_component.xml
index 8fbdb8959bb8..ce7ef8445297 100644
--- a/driver_cpl/cime_config/config_component.xml
+++ b/driver_cpl/cime_config/config_component.xml
@@ -895,7 +895,7 @@
   <entry id="SAVE_TIMING_DIR">
     <type>char</type>
     <valid_values></valid_values>
-    <default_value>UNSET</default_value>
+    <default_value>timing</default_value>
     <group>run_flags</group>
     <file>env_run.xml</file>
     <desc>Where to auto archive timing data</desc>
@@ -1146,6 +1146,14 @@
     <desc>number of wav cells in j direction - DO NOT EDIT (for experts only)</desc>
   </entry>
 
+  <entry id="MASK_GRID">
+    <type>char</type>
+    <default_value>UNSET</default_value>
+    <group>build_grid</group>
+    <file>env_build.xml</file>
+    <desc>grid mask - DO NOT EDIT (for experts only)</desc>
+  </entry>
+
   <entry id="PTS_MODE">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
diff --git a/driver_cpl/cime_config/config_compsets.xml b/driver_cpl/cime_config/config_compsets.xml
index a3258cc9fca4..7abe3c4e2ced 100644
--- a/driver_cpl/cime_config/config_compsets.xml
+++ b/driver_cpl/cime_config/config_compsets.xml
@@ -4,9 +4,9 @@
 
   <help>
     =========================================
-    compset naming convention 
+    compset naming convention
     =========================================
-    The compset longname below has the specified order 
+    The compset longname below has the specified order
     atm, lnd, ice, ocn, river, glc wave esp cesm-options
 
     The notation for the compset longname is
@@ -21,29 +21,29 @@
     GLC  = [CISM1, CISM2, SGLC]
     WAV  = [SWAV]
     ESP  = [SESP]
-    BGC  = optional BGC scenario 
+    BGC  = optional BGC scenario
 
     The OPTIONAL %phys attributes specify submodes of the given system
     For example DOCN%DOM is the data ocean model for DOCN
-    ALL the possible %phys choices for each component are listed 
+    ALL the possible %phys choices for each component are listed
     with the -list command for create_newcase
-    ALL data models must have a %phys option that corresponds to the data  model mode 
+    ALL data models must have a %phys option that corresponds to the data  model mode
 
     Each compset node is associated with the following elements
-    - lname      
-    - alias        
+    - lname
+    - alias
     - support  (optional description of the support level for this compset)
     Each compset node can also have the following attributes
     - grid  (optional regular expression match for grid to work with the compset)
   </help>
 
   <compset>
-    <alias>A</alias>           
+    <alias>A</alias>
     <lname>2000_DATM%NYF_DLND%NULL_DICE%SSMI_DOCN%DOM_DROF%NYF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
-    <alias>AWAV</alias>           
+    <alias>AWAV</alias>
     <lname>2000_DATM%WW3_DLND%NULL_DICE%COPY_DOCN%COPY_DROF%NULL_SGLC_WW3</lname>
   </compset>
 
@@ -53,12 +53,12 @@
   </compset>
 
   <compset>
-    <alias>S</alias>           
+    <alias>S</alias>
     <lname>2000_SATM_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP</lname>
   </compset>
 
   <compset>
-    <alias>X</alias>           
+    <alias>X</alias>
     <lname>2000_XATM_XLND_XICE_XOCN_XROF_XGLC_XWAV</lname>
   </compset>
 
diff --git a/utils/python/CIME/XML/grids.py b/utils/python/CIME/XML/grids.py
index ffe8eb872c97..82b392b315e7 100644
--- a/utils/python/CIME/XML/grids.py
+++ b/utils/python/CIME/XML/grids.py
@@ -98,6 +98,7 @@ def _get_domains(self, component_grids):
                  ("OCN", component_grids[2]), \
                  ("ICE", component_grids[2]), \
                  ("ROF", component_grids[3]), \
+                 ("MASK", component_grids[4]), \
                  ("GLC", component_grids[5]), \
                  ("WAV", component_grids[6])]
         mask = component_grids[4]