diff --git a/Externals.cfg b/Externals.cfg
index 723e6d98fd..ae541c324f 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -23,14 +23,14 @@ required = True
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/mosart
-tag = release-cesm2.0.00
+tag = nldas-grid.n01_mosart1_0_31
 required = True
 
 [cime]
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = ctsm/ctsm1.0/cime5.7.9/n01
+tag = ctsm/ctsm1.0/cime5.7.9/n05
 required = True
 
 [externals_description]
diff --git a/bld/namelist_files/checkmapfiles.ncl b/bld/namelist_files/checkmapfiles.ncl
index 6302615d1c..c0751adcb0 100644
--- a/bld/namelist_files/checkmapfiles.ncl
+++ b/bld/namelist_files/checkmapfiles.ncl
@@ -9,7 +9,7 @@
 ;
 
   print( "Check that datm mapping files are consistent" );
-  resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /);
+  resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "0.125nldas2", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /);
  
   space  = "      ";
   badres = 0
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 06c11ca5a0..597c71d76f 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -621,6 +621,9 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc</
 <fsurdat hgrid="ne16np4"     sim_year="2000" use_crop=".false." irrigate=".true.">
 lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc</fsurdat>
 
+<fsurdat hgrid="0.125nldas2" sim_year="2000" use_crop=".false." irrigate=".true.">
+lnd/clm2/surfdata_map/surfdata_0.125nldas2_hist_16pfts_Irrig_CMIP6_simyr2005_c190412.nc</fsurdat>
+
 <fsurdat hgrid="5x5_amazon"    sim_year="2000" use_crop=".false." irrigate=".true.">
 lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc</fsurdat>
 <fsurdat hgrid="1x1_brazil"    sim_year="2000" use_crop=".false." irrigate=".true.">
@@ -2274,6 +2277,48 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurd
 
 <!-- mapping files for ne120np4 END --> 
 
+<!-- mapping files for 0.125nldas2 START added on Wed Apr 10 11:35:47 2019-->
+<!-- Created by lnd/clm/bld/namelist_files/createMapEntry.pl-->
+
+<map frm_hgrid="1km-merge-10min"    frm_lmask="HYDRO1K-merge-nomask"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_1km-merge-10min_HYDRO1K-merge-nomask_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="5x5min"    frm_lmask="nomask"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_nomask_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="0.25x0.25"    frm_lmask="MODIS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_0.25x0.25_MODIS_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="0.9x1.25"    frm_lmask="GRDC"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_0.9x1.25_GRDC_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="10x10min"    frm_lmask="nomask"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_10x10min_nomask_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="360x720cru"    frm_lmask="cruncep"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_360x720cru_cruncep_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="LandScan2004"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_LandScan2004_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="10x10min"    frm_lmask="IGBPmergeICESatGIS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_10x10min_IGBPmergeICESatGIS_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="MODIS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_MODIS_to_0.125nldas2_nomask_aave_da_c190412.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="MODIS-wCsp"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_MODIS-wCsp_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="0.5x0.5"    frm_lmask="MODIS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_0.5x0.5_MODIS_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="GLOBE-Gardner-mergeGIS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_GLOBE-Gardner-mergeGIS_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="5x5min"    frm_lmask="ISRIC-WISE"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_ISRIC-WISE_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="GLOBE-Gardner"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_GLOBE-Gardner_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="0.5x0.5"    frm_lmask="AVHRR"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_0.5x0.5_AVHRR_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="3x3min"    frm_lmask="USGS"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_USGS_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="5x5min"    frm_lmask="IGBP-GSDP"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_IGBP-GSDP_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+<map frm_hgrid="5x5min"    frm_lmask="ORNL-Soil"  to_hgrid="0.125nldas2"   to_lmask="nomask"
+>lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_ORNL-Soil_to_0.125nldas2_nomask_aave_da_c190408.nc</map>
+
+<!-- mapping files for 0.125nldas2 END -->
+
 <map frm_hgrid="0.5x0.5"  frm_lmask="MODIS"  to_hgrid="5x5_amazon"   to_lmask="nomask" 
 >lnd/clm2/mappingdata/maps/5x5_amazon/map_0.5x0.5_MODIS_to_5x5_amazon_nomask_aave_da_c110920.nc</map>
 <map frm_hgrid="0.25x0.25"  frm_lmask="MODIS"  to_hgrid="5x5_amazon"   to_lmask="nomask" 
diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml
index 0683f52b88..9fa7b11d33 100644
--- a/bld/namelist_files/namelist_defaults_ctsm_tools.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm_tools.xml
@@ -107,6 +107,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <scripgriddata_meshname hgrid="1km-merge-10min" lmask="HYDRO1K-merge-nomask">landmesh</scripgriddata_meshname>
 
 <!-- Single-point / Regional grids -->
+<scripgriddata hgrid="0.125nldas2"         lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_0.125nldas2_nomask_c190328.nc</scripgriddata>
 <scripgriddata hgrid="1x1_asphaltjungleNJ" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc</scripgriddata>
 <scripgriddata hgrid="1x1_brazil"          lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_brazil_nomask_c110308.nc</scripgriddata>
 <scripgriddata hgrid="1x1_camdenNJ"        lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc</scripgriddata>
diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml
index 0edaa1dd76..f7f2d041c2 100644
--- a/bld/namelist_files/namelist_defaults_overall.xml
+++ b/bld/namelist_files/namelist_defaults_overall.xml
@@ -75,6 +75,7 @@ determine default values for namelists.
 <mask hgrid="ne240"               >gx1v6</mask>
 <mask hgrid="ne30"                >gx1v6</mask>
 
+<mask hgrid="0.125nldas2"         >nldas2</mask>
 <mask hgrid="5x5_amazon"          >navy</mask>
 <mask hgrid="1x1_camdenNJ"        >navy</mask>
 <mask hgrid="1x1_vancouverCAN"    >navy</mask>
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index ed25f93798..04d06b1ff5 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1794,7 +1794,7 @@ CLM run type.
 <entry id="res" type="char*30" category="default_settings"
        group="default_settings"  
        valid_values=
-"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min">
+"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min">
 Horizontal resolutions
 Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools
 </entry> 
@@ -1816,7 +1816,7 @@ hist means do NOT use a future scenario, just use historical data.
 
 <entry id="mask" type="char*10" category="default_settings"
        group="default_settings"  
-       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep">
+       valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,nldas2">
 Land mask description
 </entry> 
 
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 4362bed475..0d0bbad5b7 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -671,6 +671,80 @@
       </pes>
     </mach>
   </grid>
+  <grid name="l%0.125nldas2">
+    <mach name="any">
+      <pes pesize="any" compset="any">
+        <comment>none</comment>
+        <ntasks>
+          <ntasks_atm>-4</ntasks_atm>
+          <ntasks_lnd>-4</ntasks_lnd>
+          <ntasks_rof>-4</ntasks_rof>
+          <ntasks_ice>-4</ntasks_ice>
+          <ntasks_ocn>-4</ntasks_ocn>
+          <ntasks_glc>-4</ntasks_glc>
+          <ntasks_wav>-4</ntasks_wav>
+          <ntasks_cpl>-4</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>1</nthrds_atm>
+          <nthrds_lnd>1</nthrds_lnd>
+          <nthrds_rof>1</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>1</nthrds_wav>
+          <nthrds_cpl>1</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_glc>0</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
+  <grid name="l%0.125nldas2">
+    <mach name="cheyenne">
+      <pes pesize="any" compset="any">
+        <comment>none</comment>
+        <ntasks>
+          <ntasks_atm>-1</ntasks_atm>
+          <ntasks_lnd>-50</ntasks_lnd>
+          <ntasks_rof>-50</ntasks_rof>
+          <ntasks_ice>-50</ntasks_ice>
+          <ntasks_ocn>-50</ntasks_ocn>
+          <ntasks_glc>-50</ntasks_glc>
+          <ntasks_wav>-50</ntasks_wav>
+          <ntasks_cpl>-50</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>1</nthrds_atm>
+          <nthrds_lnd>1</nthrds_lnd>
+          <nthrds_rof>1</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>1</nthrds_wav>
+          <nthrds_cpl>1</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>-1</rootpe_lnd>
+          <rootpe_rof>-1</rootpe_rof>
+          <rootpe_ice>-1</rootpe_ice>
+          <rootpe_ocn>-1</rootpe_ocn>
+          <rootpe_glc>-1</rootpe_glc>
+          <rootpe_wav>-1</rootpe_wav>
+          <rootpe_cpl>-1</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
 
   <overrides>
     <grid name="any" >
diff --git a/python/README.md b/python/README.md
index e562dc0f84..8b265d3290 100644
--- a/python/README.md
+++ b/python/README.md
@@ -20,4 +20,7 @@ support different options:
    
 ## pylint
 
-You can run pylint on everything in the ctsm package with `make lint`
+You can run pylint on everything in the ctsm package with `make lint`.
+
+Note: you should expect some errors if using a python2 version of
+pylint, but this should be clean if running with a python3 version.
diff --git a/tools/README b/tools/README
index cf0640958c..81024eb9d0 100644
--- a/tools/README
+++ b/tools/README
@@ -142,13 +142,14 @@ III. Process sequence to create input datasets needed to run CLM
 
         c.) New atmosphere or ocean resolution
 
-        If the region DOES include ocean, use $CIMEROOT/tools/mapping/gen_domain_files/gen_maps.sh to create a 
+        If the region DOES include ocean, use
+        $CIMEROOT/tools/mapping/gen_mapping_files/gen_cesm_maps.sh to create a
         mapping file for it.
 
     Example:
 
-    cd $CIMEROOT/tools/mapping/gen_domain_files
-    ./gen_maps.sh -focn <ocngrid> -fatm <atmgrid> -nocn <ocnname> -natm <atmname>
+    cd $CIMEROOT/tools/mapping/gen_mapping_files
+    ./gen_cesm_maps.sh -focn <ocngrid> -fatm <atmgrid> -nocn <ocnname> -natm <atmname>
 
 
     3.) Add SCRIP grid file(s) created in (1) into XML database in CLM (optional)
diff --git a/tools/mkmapdata/README b/tools/mkmapdata/README
index b865e72f2d..3f5e9e92c2 100644
--- a/tools/mkmapdata/README
+++ b/tools/mkmapdata/README
@@ -12,7 +12,7 @@ two versions, one with mpiuni and one with mpi. Both versions
 also need to be built with NetCDF rather than the default
 IO version.
 
-Currently uses: ESMF7.0.0
+Currently uses: ESMF7.1.0r
 
 Do the following for help with the different options to the script...
 
@@ -44,7 +44,7 @@ and --src_type UGRID.
    http://www.earthsystemmodeling.org/
 
 You may need more than one version to do everything above. On cheyenne
-we use ESMF7.0.0.
+we use ESMF7.1.0r.
 
 The version of NetCDF used with ESMF needs to be version 4.1 or higher
 and compiled with the NetCDF4 file format enabled (with HDF5 compression).
diff --git a/tools/mkmapdata/mkmapdata.sh b/tools/mkmapdata/mkmapdata.sh
index 49a4c03b89..436b504e07 100755
--- a/tools/mkmapdata/mkmapdata.sh
+++ b/tools/mkmapdata/mkmapdata.sh
@@ -342,7 +342,7 @@ case $hostname in
   if [ -z "$REGRID_PROC" ]; then
      REGRID_PROC=36
   fi
-  esmfvers=7.0.0
+  esmfvers=7.1.0r
   intelvers=17.0.1
   module load esmf_libs/$esmfvers
   module load intel/$intelvers
@@ -371,7 +371,7 @@ case $hostname in
   if [ -z "$REGRID_PROC" ]; then
      REGRID_PROC=8
   fi
-  esmfvers=7.0.0
+  esmfvers=7.1.0r
   intelvers=15.0.0
   #intelvers=12.1.5
   module purge
diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data
index abac6af279..ddd915735d 100644
--- a/tools/mksurfdata_map/Makefile.data
+++ b/tools/mksurfdata_map/Makefile.data
@@ -66,6 +66,7 @@ STANDARD = \
 	global-present-f05 \
 	global-present-ne16np4 \
 	global-present-ne120np4 \
+	global-present-nldas \
 	global-present-T42 \
 	global-historical \
 	global-historical-ne120np4 \
@@ -128,6 +129,12 @@ global-present-ne16np4 : FORCE
 global-present-ne120np4 : FORCE
 	$(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND)
 
+# BUG(wjs, 2019-04-10, ESCOMP/ctsm#262) This -hirespft won't work until issue 262 is resolved
+# For now, I'm using:
+#    -no-crop -glc_nec 10 -y 2005 -res 0.125nldas2
+global-present-nldas : FORCE
+	$(MKSURFDATA) -no-crop -hirespft -glc_nec 10 -y 2005 -res 0.125nldas2 $(BACKGROUND)
+
 global-historical : FORCE
 	$(MKSURFDATA) -no-crop -glc_nec 10 -y 1850 -res $(STANDARD_RES) $(BACKGROUND)