diff --git a/components/mpas-cice/cime_config/buildnml b/components/mpas-cice/cime_config/buildnml
index 0ba26ab8ff22..5f149240f4b8 100755
--- a/components/mpas-cice/cime_config/buildnml
+++ b/components/mpas-cice/cime_config/buildnml
@@ -62,8 +62,8 @@ if ( $ICE_GRID eq 'oEC60to30' ) {
 	$decomp_date .= '161222';
 	$decomp_prefix .= 'mpas-cice.graph.info.';
 } elsif ( $ICE_GRID eq 'oEC60to30v3_ICG' ) {
-        $grid_date .= '170111';
-	$grid_prefix .= 'seaice.EC60to30v3.ICG_a16q_yr60';
+        $grid_date .= '170213';
+	$grid_prefix .= 'seaice.EC60to30v3.a16q_smRi_yr102';
 	$decomp_date .= '161222';
 	$decomp_prefix .= 'mpas-cice.graph.info.';
 } elsif ( $ICE_GRID eq 'oEC60to30wLI' ) {
diff --git a/components/mpas-o/bld/build-namelist b/components/mpas-o/bld/build-namelist
index fd1915eb1227..4229d2a25400 100755
--- a/components/mpas-o/bld/build-namelist
+++ b/components/mpas-o/bld/build-namelist
@@ -638,6 +638,7 @@ add_default($nl, 'config_cvmix_convective_viscosity');
 add_default($nl, 'config_cvmix_convective_basedOnBVF');
 add_default($nl, 'config_cvmix_convective_triggerBVF');
 add_default($nl, 'config_use_cvmix_shear');
+add_default($nl, 'config_cvmix_num_ri_smooth_loops');
 add_default($nl, 'config_cvmix_shear_mixing_scheme');
 add_default($nl, 'config_cvmix_shear_PP_nu_zero');
 add_default($nl, 'config_cvmix_shear_PP_alpha');
diff --git a/components/mpas-o/bld/build-namelist-section b/components/mpas-o/bld/build-namelist-section
index 3b4d799123a6..0d8281db3e42 100644
--- a/components/mpas-o/bld/build-namelist-section
+++ b/components/mpas-o/bld/build-namelist-section
@@ -225,6 +225,7 @@ add_default($nl, 'config_cvmix_convective_viscosity');
 add_default($nl, 'config_cvmix_convective_basedOnBVF');
 add_default($nl, 'config_cvmix_convective_triggerBVF');
 add_default($nl, 'config_use_cvmix_shear');
+add_default($nl, 'config_cvmix_num_ri_smooth_loops');
 add_default($nl, 'config_cvmix_shear_mixing_scheme');
 add_default($nl, 'config_cvmix_shear_PP_nu_zero');
 add_default($nl, 'config_cvmix_shear_PP_alpha');
diff --git a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
index f4d684a8370f..c8ea7b6e2535 100644
--- a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
+++ b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
@@ -197,6 +197,7 @@
 <config_cvmix_convective_basedOnBVF>.true.</config_cvmix_convective_basedOnBVF>
 <config_cvmix_convective_triggerBVF>0.0</config_cvmix_convective_triggerBVF>
 <config_use_cvmix_shear>.true.</config_use_cvmix_shear>
+<config_cvmix_num_ri_smooth_loops>2</config_cvmix_num_ri_smooth_loops>
 <config_cvmix_shear_mixing_scheme>'KPP'</config_cvmix_shear_mixing_scheme>
 <config_cvmix_shear_PP_nu_zero>0.005</config_cvmix_shear_PP_nu_zero>
 <config_cvmix_shear_PP_alpha>5.0</config_cvmix_shear_PP_alpha>
diff --git a/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
index 808db2d4f442..12a0ffc0b804 100644
--- a/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
+++ b/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
@@ -937,6 +937,14 @@ Valid values: True or False
 Default: Defined in namelist_defaults.xml
 </entry>
 
+<entry id="config_cvmix_num_ri_smooth_loops" type="integer"
+	category="cvmix" group="cvmix">
+Number of smoothing passes over RiTopOfCell for LMD94 shear instability mixing
+
+Valid values: any integer
+Default: Defined in namelist_defaults.xml
+</entry>
+
 <entry id="config_cvmix_shear_mixing_scheme" type="char*1024"
 	category="cvmix" group="cvmix">
 Choose between Pacanowski/Philander or Large et al. shear mixing
diff --git a/components/mpas-o/cime_config/buildnml b/components/mpas-o/cime_config/buildnml
index db197f49e88d..2c4792ae2864 100755
--- a/components/mpas-o/cime_config/buildnml
+++ b/components/mpas-o/cime_config/buildnml
@@ -64,8 +64,8 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
 } elsif ( $OCN_GRID eq 'oEC60to30v3_ICG' ) {
         $grid_date .= '161222';
         $grid_prefix .= 'oEC60to30v3';
-        $ic_date .= '170111';
-        $ic_prefix .= 'oEC60to30v3.ICG_a16q_yr60';
+        $ic_date .= '170213';
+        $ic_prefix .= 'oEC60to30v3.a16q_smRi_yr102';
         $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oEC60to30wLI' ) {
         $grid_date .= '160830';
@@ -666,6 +666,21 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
 	print $stream_file '    <var name="vertTransportVelocityTop"/>' . "\n";
 	print $stream_file '    <var name="normalGMBolusVelocity"/>' . "\n";
 	print $stream_file '    <var name="vertGMBolusVelocityTop"/>' . "\n";
+	print $stream_file '    <var_struct name="tracersSurfaceFlux"/>' . "\n";
+	print $stream_file '    <var name="penetrativeTemperatureFlux"/>' . "\n";
+	print $stream_file '    <var name="latentHeatFlux"/>' . "\n";
+	print $stream_file '    <var name="sensibleHeatFlux"/>' . "\n";
+	print $stream_file '    <var name="longWaveHeatFluxUp"/>' . "\n";
+	print $stream_file '    <var name="longWaveHeatFluxDown"/>' . "\n";
+	print $stream_file '    <var name="seaIceHeatFlux"/>' . "\n";
+	print $stream_file '    <var name="shortWaveHeatFlux"/>' . "\n";
+	print $stream_file '    <var name="evaporationFlux"/>' . "\n";
+	print $stream_file '    <var name="seaIceSalinityFlux"/>' . "\n";
+	print $stream_file '    <var name="seaIceFreshWaterFlux"/>' . "\n";
+	print $stream_file '    <var name="riverRunoffFlux"/>' . "\n";
+	print $stream_file '    <var name="iceRunoffFlux"/>' . "\n";
+	print $stream_file '    <var name="rainFlux"/>' . "\n";
+	print $stream_file '    <var name="snowFlux"/>' . "\n";
 	print $stream_file '</stream>' . "\n";
 	print $stream_file '' . "\n";
         print $stream_file '<stream name="timeSeriesStatsClimatologyOutput"' . "\n";
diff --git a/components/mpas-o/model b/components/mpas-o/model
index aaf6eaa532bc..86e1f72a67f3 160000
--- a/components/mpas-o/model
+++ b/components/mpas-o/model
@@ -1 +1 @@
-Subproject commit aaf6eaa532bcbc7c2aac76f7130bfac8fcdbb2e0
+Subproject commit 86e1f72a67f3e7a2b662369d37fdb74f24668599