diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
index 03db056e8b..2883377ba9 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
@@ -32,12 +32,12 @@ divSchemes
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,Yi_hs)  Gauss multivariateSelection
     {
-        O2              limitedLinear01 1;
-        N2              limitedLinear01 1;
-        C3H8            limitedLinear01 1;
-        H2O             limitedLinear01 1;
-        CO2             limitedLinear01 1;
-        hs              limitedLinear 1;
+        O2              linearUpwind grad(O2);
+        N2              linearUpwind grad(N2);
+        C3H8            linearUpwind grad(C3H8);
+        H2O             linearUpwind grad(H2O);
+        CO2             linearUpwind grad(CO2);
+        hs              linearUpwind grad(hs);
     };
     div((muEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,K)          Gauss limitedLinear 1;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
index 058c08def3..ce35cbafd7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
@@ -15,61 +15,117 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-7
+9
 (
     floor
     {
         type            wall;
         nFaces          50;
-        startFace       3896;
+        startFace       3882;
     }
     ceiling
     {
         type            wall;
         nFaces          50;
-        startFace       3946;
+        startFace       3932;
     }
     inlet
     {
         type            patch;
         nFaces          40;
-        startFace       3996;
+        startFace       3982;
     }
     outlet
     {
         type            patch;
         nFaces          40;
-        startFace       4036;
+        startFace       4022;
     }
     fixedWalls
     {
         type            empty;
         nFaces          4000;
-        startFace       4076;
+        startFace       4062;
     }
     baffle1Wall_0
     {
-        type            directMappedWall;
+        type            mappedWall;
         nFaces          14;
-        startFace       8076;
+        startFace       8062;
         sampleMode      nearestPatchFace;
         sampleRegion    region0;
         samplePatch     baffle1Wall_1;
         offsetMode      uniform;
-        offset          ( 0 0 0 );
-        faces           ( );
+        offset          (0 0 0);
     }
     baffle1Wall_1
     {
-        type            directMappedWall;
+        type            mappedWall;
         nFaces          14;
-        startFace       8090;
+        startFace       8076;
         sampleMode      nearestPatchFace;
         sampleRegion    region0;
         samplePatch     baffle1Wall_0;
         offsetMode      uniform;
-        offset          ( 0 0 0 );
-        faces           ( );
+        offset          (0 0 0);
+    }
+    region0_to_baffleRegion_baffleFaces2_top
+    {
+        type            mappedWall;
+        nFaces          14;
+        startFace       8090;
+        sampleMode      nearestPatchFace;
+        sampleRegion    baffleRegion;
+        samplePatch     region0_to_baffleRegion_baffleFaces2_top;
+        offsetMode      nonuniform;
+        offsets         
+14
+(
+(0.02 8.67362e-19 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -6.93889e-18 -0)
+(0.02 -6.93889e-18 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -0 -0)
+(0.02 -2.77556e-17 -0)
+)
+;
+    }
+    region0_to_baffleRegion_baffleFaces2_bottom
+    {
+        type            mappedWall;
+        nFaces          14;
+        startFace       8104;
+        sampleMode      nearestPatchFace;
+        sampleRegion    baffleRegion;
+        samplePatch     region0_to_baffleRegion_baffleFaces2_bottom;
+        offsetMode      nonuniform;
+        offsets         
+14
+(
+(1.11022e-16 8.67362e-19 -0)
+(1.11022e-16 -3.46945e-18 -0)
+(-1.11022e-16 -0 -0)
+(-1.11022e-16 -6.93889e-18 1.11022e-16)
+(-1.11022e-16 -1.38778e-17 -0)
+(-1.11022e-16 1.38778e-17 -0)
+(-1.11022e-16 -0 -0)
+(-0 -0 -0)
+(-1.11022e-16 -0 -0)
+(-1.11022e-16 -0 -0)
+(-0 -0 -0)
+(-0 -2.77556e-17 -0)
+(-0 -0 -0)
+(-0 -2.77556e-17 -0)
+)
+;
     }
 )
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
index 7b72e85f59..7abdd81f4f 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
@@ -15,37 +15,43 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
+6
 (
     outlet
     {
         type            patch;
-        nFaces          600;
-        startFace       51900;
+        nFaces          922;
+        startFace       364825;
     }
     sides
     {
         type            patch;
-        nFaces          1200;
-        startFace       52500;
+        nFaces          1834;
+        startFace       365747;
     }
     inlet
     {
         type            patch;
-        nFaces          600;
-        startFace       53700;
+        nFaces          923;
+        startFace       367581;
     }
     ground
     {
         type            wall;
-        nFaces          900;
-        startFace       54300;
+        nFaces          0;
+        startFace       368504;
     }
     top
     {
         type            patch;
         nFaces          900;
-        startFace       55200;
+        startFace       368504;
+    }
+    terrain_patch0
+    {
+        type            wall;
+        nFaces          16037;
+        startFace       369404;
     }
 )