diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index d0183e9f7d..8f1ebe37c8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
             dict
         )   << "unphysical accommodationCoeff specified"
             << "(0 < accommodationCoeff <= 1)" << endl
-            << exit(FatalError);
+            << exit(FatalIOError);
     }
 
     if (dict.found("value"))
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 875e42683e..61861b33fa 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -94,7 +94,7 @@ maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
             dict
         )   << "unphysical accommodationCoeff_ specified"
             << "(0 < accommodationCoeff_ <= 1)" << endl
-            << exit(FatalError);
+            << exit(FatalIOError);
     }
 
     if (dict.found("value"))
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index 8f31a2b460..5c1459381f 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,6 +98,7 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
     valueFraction_(ptf.valueFraction_)
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // Map from self
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 6f8712a0b3..097330487e 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,60 +104,50 @@ int main(int argc, char *argv[])
         polyMeshDir = polyMesh::meshSubDir;
     }
 
-    autoPtr<IOobject> meshDictIoPtr;
+    IOobject meshDictIO
+    (
+        dictName,
+        runTime.constant(),
+        polyMeshDir,
+        runTime,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
 
     if (args.optionFound("dict"))
     {
         const fileName dictPath = args["dict"];
 
-        meshDictIoPtr.set
+        meshDictIO = IOobject
         (
-            new IOobject
             (
-                (
-                    isDir(dictPath)
-                  ? dictPath/dictName
-                  : dictPath
-                ),
-                runTime,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        );
-    }
-    else
-    {
-        meshDictIoPtr.set
-        (
-            new IOobject
-            (
-                dictName,
-                runTime.constant(),
-                polyMeshDir,
-                runTime,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
+                isDir(dictPath)
+              ? dictPath/dictName
+              : dictPath
+            ),
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
         );
     }
 
-    if (!meshDictIoPtr->headerOk())
+    if (!meshDictIO.headerOk())
     {
         FatalErrorIn(args.executable())
             << "Cannot open mesh description file\n    "
-            << meshDictIoPtr->objectPath()
+            << meshDictIO.objectPath()
             << nl
             << exit(FatalError);
     }
 
     Info<< "Creating block mesh from\n    "
-        << meshDictIoPtr->objectPath() << endl;
+        << meshDictIO.objectPath() << endl;
 
     blockMesh::verbose(true);
 
-    IOdictionary meshDict(meshDictIoPtr());
+    IOdictionary meshDict(meshDictIO);
     blockMesh blocks(meshDict, regionName);
 
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index be4fffa8df..b159f9c096 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1241,8 +1241,7 @@ int main(int argc, char *argv[])
 
     #include "addRegionOption.H"
     #include "addOverwriteOption.H"
-    argList::addOption("dict", "name", "specify alternative dictionary");
-
+    #include "addDictOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
@@ -1263,19 +1262,14 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
     bool overwrite = args.optionFound("overwrite");
-    const word dictName
-        (args.optionLookupOrDefault<word>("dict", "extrudeToRegionMeshDict"));
 
-    IOdictionary dict
-    (
-        IOobject
-        (
-            dictName,
-            runTime.system(),
-            runTime,
-            IOobject::MUST_READ_IF_MODIFIED
-        )
-    );
+
+    const word dictName("extrudeToRegionMeshDict");
+
+    #include "setSystemMeshDictionaryIO.H"
+
+    IOdictionary dict(dictIO);
+
 
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(dict));
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 6b63430918..2406cb667c 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -369,7 +369,10 @@ int main(int argc, char *argv[])
     // Add all the surface regions as patches
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList globalToPatch;
+    //- Global surface region to patch (non faceZone surface) or patches
+    //  (faceZone surfaces)
+    labelList globalToMasterPatch;
+    labelList globalToSlavePatch;
     {
         Info<< nl
             << "Adding patches for surface regions" << nl
@@ -377,7 +380,8 @@ int main(int argc, char *argv[])
             << endl;
 
         // From global region number to mesh patch.
-        globalToPatch.setSize(surfaces.nRegions(), -1);
+        globalToMasterPatch.setSize(surfaces.nRegions(), -1);
+        globalToSlavePatch.setSize(surfaces.nRegions(), -1);
 
         Info<< "Patch\tType\tRegion" << nl
             << "-----\t----\t------"
@@ -394,36 +398,111 @@ int main(int argc, char *argv[])
 
             Info<< surfaces.names()[surfI] << ':' << nl << nl;
 
-            forAll(regNames, i)
+            if (surfaces.faceZoneNames()[surfI].empty())
             {
-                label globalRegionI = surfaces.globalRegion(surfI, i);
-
-                label patchI;
-
-                if (surfacePatchInfo.set(globalRegionI))
+                // 'Normal' surface
+                forAll(regNames, i)
                 {
-                    patchI = meshRefiner.addMeshedPatch
-                    (
-                        regNames[i],
-                        surfacePatchInfo[globalRegionI]
-                    );
+                    label globalRegionI = surfaces.globalRegion(surfI, i);
+
+                    label patchI;
+
+                    if (surfacePatchInfo.set(globalRegionI))
+                    {
+                        patchI = meshRefiner.addMeshedPatch
+                        (
+                            regNames[i],
+                            surfacePatchInfo[globalRegionI]
+                        );
+                    }
+                    else
+                    {
+                        dictionary patchInfo;
+                        patchInfo.set("type", wallPolyPatch::typeName);
+
+                        patchI = meshRefiner.addMeshedPatch
+                        (
+                            regNames[i],
+                            patchInfo
+                        );
+                    }
+
+                    Info<< patchI << '\t' << mesh.boundaryMesh()[patchI].type()
+                        << '\t' << regNames[i] << nl;
+
+                    globalToMasterPatch[globalRegionI] = patchI;
+                    globalToSlavePatch[globalRegionI] = patchI;
                 }
-                else
+            }
+            else
+            {
+                // Zoned surface
+                forAll(regNames, i)
                 {
-                    dictionary patchInfo;
-                    patchInfo.set("type", wallPolyPatch::typeName);
+                    label globalRegionI = surfaces.globalRegion(surfI, i);
 
-                    patchI = meshRefiner.addMeshedPatch
-                    (
-                        regNames[i],
-                        patchInfo
-                    );
+                    // Add master side patch
+                    {
+                        label patchI;
+
+                        if (surfacePatchInfo.set(globalRegionI))
+                        {
+                            patchI = meshRefiner.addMeshedPatch
+                            (
+                                regNames[i],
+                                surfacePatchInfo[globalRegionI]
+                            );
+                        }
+                        else
+                        {
+                            dictionary patchInfo;
+                            patchInfo.set("type", wallPolyPatch::typeName);
+
+                            patchI = meshRefiner.addMeshedPatch
+                            (
+                                regNames[i],
+                                patchInfo
+                            );
+                        }
+
+                        Info<< patchI << '\t'
+                            << mesh.boundaryMesh()[patchI].type()
+                            << '\t' << regNames[i] << nl;
+
+                        globalToMasterPatch[globalRegionI] = patchI;
+                    }
+                    // Add slave side patch
+                    {
+                        const word slaveName = regNames[i] + "_slave";
+                        label patchI;
+
+                        if (surfacePatchInfo.set(globalRegionI))
+                        {
+                            patchI = meshRefiner.addMeshedPatch
+                            (
+                                slaveName,
+                                surfacePatchInfo[globalRegionI]
+                            );
+                        }
+                        else
+                        {
+                            dictionary patchInfo;
+                            patchInfo.set("type", wallPolyPatch::typeName);
+
+                            patchI = meshRefiner.addMeshedPatch
+                            (
+                                slaveName,
+                                patchInfo
+                            );
+                        }
+
+                        Info<< patchI << '\t'
+                            << mesh.boundaryMesh()[patchI].type()
+                            << '\t' << slaveName << nl;
+
+                        globalToSlavePatch[globalRegionI] = patchI;
+                    }
                 }
-
-                Info<< patchI << '\t' << mesh.boundaryMesh()[patchI].type()
-                    << '\t' << regNames[i] << nl;
-
-                globalToPatch[globalRegionI] = patchI;
             }
 
             Info<< nl;
@@ -479,7 +558,8 @@ int main(int argc, char *argv[])
             meshRefiner,
             decomposer,
             distributor,
-            globalToPatch
+            globalToMasterPatch,
+            globalToSlavePatch
         );
 
         // Refinement parameters
@@ -510,7 +590,8 @@ int main(int argc, char *argv[])
         autoSnapDriver snapDriver
         (
             meshRefiner,
-            globalToPatch
+            globalToMasterPatch,
+            globalToSlavePatch
         );
 
         // Snap parameters
@@ -544,7 +625,12 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoLayerDriver layerDriver(meshRefiner, globalToPatch);
+        autoLayerDriver layerDriver
+        (
+            meshRefiner,
+            globalToMasterPatch,
+            globalToSlavePatch
+        );
 
         // Layer addition parameters
         layerParameters layerParams(layerDict, mesh.boundaryMesh());
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index c2e2a06ebb..89beec32ef 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -117,14 +117,9 @@ int main(int argc, char *argv[])
         "Makes internal faces into boundary faces.\n"
         "Does not duplicate points."
     );
-
+    #include "addDictOption.H"
     #include "addOverwriteOption.H"
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify alternative dictionary for the createBaffles description"
-    );
+    #include "addDictOption.H"
     #include "addRegionOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
@@ -136,14 +131,8 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
-    const word dictName
-    (
-        args.optionLookupOrDefault<word>
-        (
-            "dict",
-            "createBafflesDict"
-        )
-    );
+    const word dictName("createBafflesDict");
+    #include "setSystemMeshDictionaryIO.H"
 
     Switch internalFacesOnly(false);
 
@@ -152,17 +141,7 @@ int main(int argc, char *argv[])
     PtrList<faceSelection> selectors;
     {
         Info<< "Reading baffle criteria from " << dictName << nl << endl;
-        IOdictionary dict
-        (
-            IOobject
-            (
-                dictName,
-                mesh.time().system(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
+        IOdictionary dict(dictIO);
 
         dict.lookup("internalFacesOnly") >> internalFacesOnly;
         noFields = dict.lookupOrDefault("noFields", false);
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 7a969e15d1..9e89c8d4df 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -505,13 +505,7 @@ int main(int argc, char *argv[])
 {
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
-    argList::addOption
-    (
-        "dict",
-        "word",
-        "name of dictionary to provide patch information"
-    );
-
+    #include "addDictOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -521,38 +515,20 @@ int main(int argc, char *argv[])
 
     const bool overwrite = args.optionFound("overwrite");
 
-    word dictName
-    (
-        args.optionLookupOrDefault<word>("dict", "createPatchDict")
-    );
+    #include "createNamedPolyMesh.H"
+
+    const word oldInstance = mesh.pointsInstance();
+
+    const word dictName("createPatchDict");
+    #include "setSystemMeshDictionaryIO.H"
 
     Info<< "Reading " << dictName << nl << endl;
 
-    IOdictionary dict
-    (
-        IOobject
-        (
-            dictName,
-            runTime.system(),
-            (
-                meshRegionName != polyMesh::defaultRegion
-              ? meshRegionName
-              : word::null
-            ),
-            runTime,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
-
+    IOdictionary dict(dictIO);
 
     // Whether to synchronise points
     const Switch pointSync(dict.lookup("pointSync"));
 
-    #include "createNamedPolyMesh.H"
-
-    const word oldInstance = mesh.pointsInstance();
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index f8a206e651..098864102d 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -298,12 +298,7 @@ int main(int argc, char *argv[])
 
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
-    argList::addBoolOption
-    (
-        "dict",
-        "refine according to system/refineMeshDict"
-    );
-
+    #include "addDictOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -327,19 +322,12 @@ int main(int argc, char *argv[])
 
     if (readDict)
     {
-        Info<< "Refining according to refineMeshDict" << nl << endl;
+        const word dictName("refineMeshDict");
+        #include "setSystemMeshDictionaryIO.H"
 
-        refineDict = IOdictionary
-        (
-            IOobject
-            (
-                "refineMeshDict",
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        );
+        Info<< "Refining according to " << dictName << nl << endl;
+
+        refineDict = IOdictionary(dictIO);
 
         const word setName(refineDict.lookup("set"));
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 7eede94626..d03f24cd7c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -614,11 +614,7 @@ int main(int argc, char *argv[])
 #   include "addRegionOption.H"
 #   include "addOverwriteOption.H"
 #   include "addTimeOptions.H"
-    argList::addBoolOption
-    (
-        "dict",
-        "renumber according to system/renumberMeshDict"
-    );
+#   include "addDictOption.H"
     argList::addBoolOption
     (
         "frontWidth",
@@ -700,23 +696,13 @@ int main(int argc, char *argv[])
 
     if (readDict)
     {
-        Info<< "Renumber according to renumberMeshDict." << nl << endl;
+        const word dictName("renumberMeshDict");
+        #include "setSystemMeshDictionaryIO.H"
 
-        renumberDictPtr.reset
-        (
-            new IOdictionary
-            (
-                IOobject
-                (
-                    "renumberMeshDict",
-                    runTime.system(),
-                    mesh,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-        const IOdictionary renumberDict = renumberDictPtr();
+        Info<< "Renumber according to " << dictName << nl << endl;
+
+        renumberDictPtr.reset(new IOdictionary(dictIO));
+        const IOdictionary& renumberDict = renumberDictPtr();
 
         renumberPtr = renumberMethod::New(renumberDict);
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C b/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C
index 556ae4e07e..7cb4eec518 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/cellSelection/outsideCellSelection.C
@@ -156,10 +156,21 @@ Foam::boolList Foam::cellSelections::outsideCellSelection::findRegions
         reduce(keepRegionI, maxOp<label>());
         keepRegion[keepRegionI] = true;
 
+        reduce(keepProcI, maxOp<label>());
+
+        if (keepProcI == -1)
+        {
+            FatalErrorIn
+            (
+                "outsideCellSelection::findRegions"
+                "(const bool, const regionSplit&)"
+            )   << "Did not find " << locationsInMesh_[i]
+                << " in mesh." << " Mesh bounds are " << mesh_.bounds()
+                << exit(FatalError);
+        }
+
         if (verbose)
         {
-            reduce(keepProcI, maxOp<label>());
-
             Info<< "Found location " << locationsInMesh_[i]
                 << " in cell " << cellI << " on processor " << keepProcI
                 << " in global region " << keepRegionI
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index e1cc69aa7e..f4f1250cb1 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -155,12 +155,7 @@ int main(int argc, char *argv[])
         "select a mesh subset based on a provided cellSet and/or"
         " selection criteria"
     );
-    argList::addBoolOption
-    (
-        "dict",
-        "read mesh subset selection criteria"
-        " from system/subsetMeshDict"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "cellSet",
@@ -210,18 +205,10 @@ int main(int argc, char *argv[])
     PtrList<cellSelection> selectors;
     if (useDict)
     {
-        Info<< "Reading selection criteria from subsetMeshDict" << nl << endl;
-        IOdictionary dict
-        (
-            IOobject
-            (
-                "subsetMeshDict",
-                mesh.time().system(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
+        const word dictName("subsetMeshDict");
+        #include "setSystemMeshDictionaryIO.H"
+        Info<< "Reading selection criteria from " << dictName << nl << endl;
+        IOdictionary dict(dictIO);
 
         const dictionary& selectionsDict = dict.subDict("selections");
 
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict b/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict
index 0f725142a3..93280bb305 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMeshDict
@@ -27,7 +27,7 @@ selections
         // used by snappyHexMesh, cvMesh.
         type    badQuality;
         // Use the quality criteria from the snappyHexMeshDict
-        ${.meshQualityControls}
+        ${:meshQualityControls}
     }
 
     outside
@@ -42,7 +42,7 @@ selections
         //- Define mesh location for keeping.
         //  In this case use the one from snappyHexMeshDict. This can
         //  optionally be a list of locations.
-        locationsInMesh (${.castellatedMeshControls.locationInMesh});
+        locationsInMesh (${:castellatedMeshControls.locationInMesh});
     }
 }
 
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index c124ca3992..6dee4fd0b5 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -193,12 +193,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions(true, false);
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for the topoSet dictionary"
-    );
+    #include "addDictOption.H"
     #include "addRegionOption.H"
     argList::addBoolOption
     (
@@ -216,41 +211,11 @@ int main(int argc, char *argv[])
     const bool noSync = args.optionFound("noSync");
 
     const word dictName("topoSetDict");
-
-    fileName dictPath = dictName;
-    if (args.optionFound("dict"))
-    {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
-    }
+    #include "setSystemMeshDictionaryIO.H"
 
     Info<< "Reading " << dictName << "\n" << endl;
 
-    IOdictionary topoSetDict
-    (
-        (
-            args.optionFound("dict")
-          ? IOobject
-            (
-                dictPath,
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-          : IOobject
-            (
-                dictName,
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        )
-    );
-
+    IOdictionary topoSetDict(dictIO);
 
     // Read set construct info from dictionary
     PtrList<dictionary> actions(topoSetDict.lookup("actions"));
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 5b85aee077..49c70eb1c3 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
         "keywords",
         "report keywords for the specified dictionary"
     );
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify a dictionary to interrogate"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "entry",
@@ -81,9 +76,12 @@ int main(int argc, char *argv[])
 
     if (args.optionFound("dict"))
     {
+        fileName dictPath = args["dict"];
         const fileName dictFileName
         (
-            args.rootPath()/args.caseName()/args["dict"]
+            dictPath.isAbsolute()
+          ? dictPath
+          : args.rootPath()/args.caseName()/args["dict"]
         );
 
         IFstream dictFile(dictFileName);
diff --git a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
index 39d0a581d5..3e5c99f3e4 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,12 +49,7 @@ int main(int argc, char *argv[])
         "noWrite",
         "suppress writing results"
     );
-    Foam::argList::addOption
-    (
-        "dict",
-        "name",
-        "dictionary to use"
-    );
+#   include "addDictOption.H"
 
     if (argc < 2)
     {
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
index 24854ab6b6..309d7718f6 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
@@ -1,16 +1,9 @@
-word dictName(args.optionLookupOrDefault<word>("dict", "particleTrackDict"));
+const word dictName("particleTrackDict");
 
-IOdictionary propsDict
-(
-    IOobject
-    (
-        dictName,
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED
-    )
-);
+#include "setConstantMeshDictionaryIO.H"
+
+IOdictionary propsDict(dictIO);
 
 word cloudName(propsDict.lookup("cloudName"));
 
-List<word> userFields(propsDict.lookup("fields"));
\ No newline at end of file
+List<word> userFields(propsDict.lookup("fields"));
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 4c1bea3c2d..5a6fad75a6 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
     argList::noParallel();
     timeSelector::addOptions();
     #include "addRegionOption.H"
-    argList::validOptions.insert("dict", "");
+    #include "addDictOption.H"
 
     #include "setRootCase.H"
 
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index b133509318..e5c6735d8c 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -65,7 +65,6 @@ namespace Foam
                 IOobject
                 (
                     args["dict"],
-                    runTime.system(),
                     runTime,
                     IOobject::MUST_READ_IF_MODIFIED
                 )
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
index 5c02fe31e7..59c73ffc60 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
+++ b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     (
         probes::typeName,
         mesh,
-        "probesDict",
+        word("probesDict"), // force the use of the system directory
         IOobject::MUST_READ,
         true
     );
diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C
index 6b09aa19b9..6641508a57 100644
--- a/applications/utilities/postProcessing/sampling/sample/sample.C
+++ b/applications/utilities/postProcessing/sampling/sample/sample.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,37 +97,82 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
     #include "addRegionOption.H"
-    argList::addOption
-    (
-        "dict",
-        "word",
-        "name of dictionary to provide sample information"
-    );
-
+    #include "addDictOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
     #include "createNamedMesh.H"
 
-    word sampleDict(args.optionLookupOrDefault<word>("dict", "sampleDict"));
+    const word dictName("sampleDict");
 
-    IOsampledSets sSets
-    (
-        sampledSets::typeName,
-        mesh,
-        sampleDict,
-        IOobject::MUST_READ_IF_MODIFIED,
-        true
-    );
+    autoPtr<IOsampledSets> sSetsPtr;
+    autoPtr<IOsampledSurfaces> sSurfsPtr;
 
-    IOsampledSurfaces sSurfs
-    (
-        sampledSurfaces::typeName,
-        mesh,
-        sampleDict,
-        IOobject::MUST_READ_IF_MODIFIED,
-        true
-    );
+    if (args.optionFound("dict"))
+    {
+        // Construct from fileName
+
+        fileName dictPath = args["dict"];
+        if (isDir(dictPath))
+        {
+            dictPath = dictPath / dictName;
+        }
+
+        sSetsPtr.reset
+        (
+            new IOsampledSets
+            (
+                sampledSets::typeName,
+                mesh,
+                dictPath,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+
+        sSurfsPtr.reset
+        (
+            new IOsampledSurfaces
+            (
+                sampledSurfaces::typeName,
+                mesh,
+                dictPath,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+    }
+    else
+    {
+        // Construct from name in system() directory
+
+        sSetsPtr.reset
+        (
+            new IOsampledSets
+            (
+                sampledSets::typeName,
+                mesh,
+                dictName,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+
+        sSurfsPtr.reset
+        (
+            new IOsampledSurfaces
+            (
+                sampledSurfaces::typeName,
+                mesh,
+                dictName,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+    }
+
+    IOsampledSets& sSets = sSetsPtr();
+    IOsampledSurfaces& sSurfs = sSurfsPtr();
 
     forAll(timeDirs, timeI)
     {
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 58bdc7c59c..86ba1b4849 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -140,6 +140,7 @@ sets
 
     patchSeed
     {
+        type        patchSeed;
         patches     (".*Wall.*");
         // Number of points to seed. Divided amongst all processors according
         // to fraction of patches they hold.
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 3c664cfc3b..4bb711880a 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -385,12 +385,7 @@ bool merge
 
 int main(int argc, char *argv[])
 {
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify an alternative to system/changeDictionaryDict"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "instance",
@@ -432,21 +427,8 @@ int main(int argc, char *argv[])
     runTime.setTime(times[0], 0);
     word instance = args.optionLookupOrDefault("instance", runTime.timeName());
 
-
     #include "createNamedMesh.H"
 
-    const word dictName("changeDictionaryDict");
-
-    fileName dictPath = dictName;
-    if (args.optionFound("dict"))
-    {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
-    }
-
     const bool literalRE = args.optionFound("literalRE");
     if (literalRE)
     {
@@ -493,27 +475,10 @@ int main(int argc, char *argv[])
 
 
     // Get the replacement rules from a dictionary
-    IOdictionary dict
-    (
-        (
-            args.optionFound("dict")
-          ? IOobject
-            (
-                dictPath,
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-          : IOobject
-            (
-                dictName,
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        )
-    );
+
+    const word dictName("changeDictionaryDict");
+    #include "setSystemMeshDictionaryIO.H"
+    IOdictionary dict(dictIO);
 
     const dictionary& replaceDicts = dict.subDict("dictionaryReplacement");
     Info<< "Read dictionary " << dict.name()
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index 39b6572ef1..2e3a56007b 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,22 +48,22 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     #include "addRegionOption.H"
-    argList::addOption
-    (
-        "dict",
-        "word",
-        "name of dictionary to provide patch agglomeration controls"
-    );
+    #include "addDictOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
 
-    word agglomDictName
-    (
-        args.optionLookupOrDefault<word>("dict", "faceAgglomerateDict")
-    );
+    const word dictName("faceAgglomerateDict");
 
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+    #include "setConstantMeshDictionaryIO.H"
+
+    // Read control dictionary
+    const IOdictionary agglomDict(dictIO);
+
+    bool writeAgglom = readBool(agglomDict.lookup("writeFacesAgglomeration"));
+
+
+    const polyBoundaryMesh& boundary = mesh.boundaryMesh();
 
     labelListIOList finalAgglom
     (
@@ -76,27 +76,9 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE,
             false
         ),
-        patches.size()
+        boundary.size()
     );
 
-
-    // Read control dictionary
-    IOdictionary agglomDict
-    (
-        IOobject
-        (
-            agglomDictName,
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    bool writeAgglom = readBool(agglomDict.lookup("writeFacesAgglomeration"));
-
-    const polyBoundaryMesh& boundary = mesh.boundaryMesh();
-
     forAll(boundary, patchId)
     {
         const polyPatch& pp = boundary[patchId];
@@ -178,7 +160,6 @@ int main(int argc, char *argv[])
 
         forAll(boundary, patchId)
         {
-
             fvPatchScalarField& bFacesAgglomeration =
                 facesAgglomeration.boundaryField()[patchId];
 
@@ -188,7 +169,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        Info << "\nWriting  facesAgglomeration" << endl;
+        Info<< "\nWriting facesAgglomeration" << endl;
         facesAgglomeration.write();
     }
 
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerateDict b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerateDict
new file mode 100644
index 0000000000..9c164f1509
--- /dev/null
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerateDict
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      viewFactorsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Write agglomeration as a volScalarField with calculated boundary values
+writeFacesAgglomeration   true;
+
+// Per patch (wildcard possible) the coarsening level
+bottomAir_to_heater
+{
+    nFacesInCoarsestLevel     30;
+    featureAngle              10;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index b3b390af51..03d1ba874d 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -680,35 +680,17 @@ int main(int argc, char *argv[])
     );
     argList::noParallel();
 
-    argList::addOption
-    (
-        "dict",
-        "word",
-        "specify alternative dictionary for the feature extraction information"
-    );
+#   include "addDictOption.H"
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    word dictName
-    (
-        args.optionLookupOrDefault<word>("dict", "surfaceFeatureExtractDict")
-    );
+    const word dictName("surfaceFeatureExtractDict");
+#   include "setSystemRunTimeDictionaryIO.H"
 
     Info<< "Reading " << dictName << nl << endl;
 
-    IOdictionary dict
-    (
-        IOobject
-        (
-            dictName,
-            runTime.system(),
-            runTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
+    const IOdictionary dict(dictIO);
 
     forAllConstIter(dictionary, dict, iter)
     {
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 305786f963..ea30c2dd55 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -96,12 +96,7 @@ int main(int argc, char *argv[])
         "factor",
         "geometry scaling factor on output"
     );
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify alternative dictionary for the coordinateSystems descriptions"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "from",
@@ -154,19 +149,28 @@ int main(int argc, char *argv[])
     {
         autoPtr<IOobject> csDictIoPtr;
 
+        const word dictName("coordinateSystems::typeName");
+
+        // Note: cannot use setSystemRunTimeDictionaryIO.H since dictionary
+        //       is in constant
+
+        fileName dictPath = "";
         if (args.optionFound("dict"))
         {
-            const fileName dictPath = args["dict"];
+            dictPath = args["dict"];
+            if (isDir(dictPath))
+            {
+                dictPath = dictPath / dictName;
+            }
+        }
 
+        if (dictPath.size())
+        {
             csDictIoPtr.set
             (
                 new IOobject
                 (
-                    (
-                        isDir(dictPath)
-                      ? dictPath/coordinateSystems::typeName
-                      : dictPath
-                    ),
+                    dictPath,
                     runTime,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
@@ -180,7 +184,7 @@ int main(int argc, char *argv[])
             (
                 new IOobject
                 (
-                    coordinateSystems::typeName,
+                    dictName,
                     runTime.constant(),
                     runTime,
                     IOobject::MUST_READ,
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 7c9b3be904..f8a5ebf57a 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -103,12 +103,7 @@ int main(int argc, char *argv[])
         "factor",
         "geometry scaling factor on output - default is 1"
     );
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for constant/coordinateSystems"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "from",
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 3a14ac63c4..87ff39d182 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -103,12 +103,7 @@ int main(int argc, char *argv[])
         "factor",
         "geometry scaling factor on output - default is 1"
     );
-    argList::addOption
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for constant/coordinateSystems"
-    );
+    #include "addDictOption.H"
     argList::addOption
     (
         "from",
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index e9e48e9554..47e14b0577 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ defineTypeNameAndDebug(Foam::IOobject, 0);
 //    -----               ------
 //    "foo"               ("", "", "foo")
 //    "foo/bar"           ("foo", "", "bar")
-//    "/XXX"              ERROR - no absolute path
+//    "/XXX/bar"          ("/XXX", "", "bar")
 //    "foo/bar/"          ERROR - no name
 //    "foo/xxx/bar"       ("foo", "xxx", "bar")
 //    "foo/xxx/yyy/bar"   ("foo", "xxx/yyy", "bar")
@@ -64,14 +64,6 @@ bool Foam::IOobject::IOobject::fileNameComponents
         return false;
     }
 
-    if (path.isAbsolute())
-    {
-        // called with absolute path
-        WarningIn("IOobject::fileNameComponents(const fileName&, ...)")
-            << "called with absolute path: " << path << "\n";
-        return false;
-    }
-
     string::size_type first = path.find('/');
 
     if (first == string::npos)
@@ -81,6 +73,15 @@ bool Foam::IOobject::IOobject::fileNameComponents
         // check afterwards
         name.string::operator=(path);
     }
+    else if (first == 0)
+    {
+        // Leading '/'. Absolute fileName
+        string::size_type last = path.rfind('/');
+        instance = path.substr(0, last);
+
+        // check afterwards
+        name.string::operator=(path.substr(last+1));
+    }
     else
     {
         instance = path.substr(0, first);
@@ -246,7 +247,14 @@ const Foam::fileName& Foam::IOobject::rootPath() const
 
 Foam::fileName Foam::IOobject::path() const
 {
-    return rootPath()/caseName()/instance()/db_.dbDir()/local();
+    if (instance().isAbsolute())
+    {
+        return instance();
+    }
+    else
+    {
+        return rootPath()/caseName()/instance()/db_.dbDir()/local();
+    }
 }
 
 
@@ -256,61 +264,80 @@ Foam::fileName Foam::IOobject::path
     const fileName& local
 ) const
 {
+    //Note: can only be called with relative instance since is word type
     return rootPath()/caseName()/instance/db_.dbDir()/local;
 }
 
 
 Foam::fileName Foam::IOobject::filePath() const
 {
-    fileName path = this->path();
-    fileName objectPath = path/name();
-
-    if (isFile(objectPath))
+    if (instance().isAbsolute())
     {
-        return objectPath;
+        fileName objectPath = instance()/name();
+        if (isFile(objectPath))
+        {
+            return objectPath;
+        }
+        else
+        {
+            return fileName::null;
+        }
     }
     else
     {
-        if
-        (
-            time().processorCase()
-         && (
-                instance() == time().system()
-             || instance() == time().constant()
-            )
-        )
-        {
-            fileName parentObjectPath =
-                rootPath()/caseName()
-               /".."/instance()/db_.dbDir()/local()/name();
+        fileName path = this->path();
+        fileName objectPath = path/name();
 
-            if (isFile(parentObjectPath))
-            {
-                return parentObjectPath;
-            }
+        if (isFile(objectPath))
+        {
+            return objectPath;
         }
-
-        if (!isDir(path))
+        else
         {
-            word newInstancePath = time().findInstancePath(instant(instance()));
-
-            if (newInstancePath.size())
+            if
+            (
+                time().processorCase()
+             && (
+                    instance() == time().system()
+                 || instance() == time().constant()
+                )
+            )
             {
-                fileName fName
-                (
+                fileName parentObjectPath =
                     rootPath()/caseName()
-                   /newInstancePath/db_.dbDir()/local()/name()
+                   /".."/instance()/db_.dbDir()/local()/name();
+
+                if (isFile(parentObjectPath))
+                {
+                    return parentObjectPath;
+                }
+            }
+
+            if (!isDir(path))
+            {
+                word newInstancePath = time().findInstancePath
+                (
+                    instant(instance())
                 );
 
-                if (isFile(fName))
+                if (newInstancePath.size())
                 {
-                    return fName;
+                    fileName fName
+                    (
+                        rootPath()/caseName()
+                       /newInstancePath/db_.dbDir()/local()/name()
+                    );
+
+                    if (isFile(fName))
+                    {
+                        return fName;
+                    }
                 }
             }
         }
-    }
 
-    return fileName::null;
+        return fileName::null;
+    }
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
index 92991b1b1d..18b46f29af 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
 (
     const word& outputFilterName,
     const objectRegistry& obr,
-    const fileName& dictName,
+    const word& dictName,
     const IOobject::readOption rOpt,
     const bool readFromFiles
 )
@@ -66,6 +66,30 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
 {}
 
 
+template<class OutputFilter>
+Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
+(
+    const word& outputFilterName,
+    const objectRegistry& obr,
+    const fileName& dictName,
+    const IOobject::readOption rOpt,
+    const bool readFromFiles
+)
+:
+    IOdictionary
+    (
+        IOobject
+        (
+            dictName,
+            obr,
+            rOpt,
+            IOobject::NO_WRITE
+        )
+    ),
+    OutputFilter(outputFilterName, obr, *this, readFromFiles)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class OutputFilter>
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index ebddc142cb..c115023a63 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,19 @@ public:
         (
             const word& outputFilterName,
             const objectRegistry&,
-            const fileName& dictName = OutputFilter::typeName() + "Dict",
+            const word& dictName = OutputFilter::typeName() + "Dict",
+            const IOobject::readOption rOpt = IOobject::MUST_READ_IF_MODIFIED,
+            const bool loadFromFile = false
+        );
+
+        //- Construct for given objectRegistry and dictionary
+        //  Dictionary read from full path.
+        //  Allow the possibility to load fields from files
+        IOOutputFilter
+        (
+            const word& outputFilterName,
+            const objectRegistry&,
+            const fileName& dictName,
             const IOobject::readOption rOpt = IOobject::MUST_READ_IF_MODIFIED,
             const bool loadFromFile = false
         );
diff --git a/src/OpenFOAM/include/addDictOption.H b/src/OpenFOAM/include/addDictOption.H
new file mode 100644
index 0000000000..f538e57294
--- /dev/null
+++ b/src/OpenFOAM/include/addDictOption.H
@@ -0,0 +1,10 @@
+//
+// addDictOption.H
+// ~~~~~~~~~~~~~~~~~
+
+    Foam::argList::addOption
+    (
+        "dict",
+        "file",
+        "read control dictionary from specified location"
+    );
diff --git a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
new file mode 100644
index 0000000000..4f97cf1694
--- /dev/null
+++ b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
@@ -0,0 +1,33 @@
+//
+// setConstantMeshDictionaryIO.H
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    fileName dictPath = "";
+    if (args.optionFound("dict"))
+    {
+        dictPath = args["dict"];
+        if (isDir(dictPath))
+        {
+            dictPath = dictPath / dictName;
+        }
+    }
+
+    IOobject dictIO
+    (
+        dictName,
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    );
+
+    if (dictPath.size())
+    {
+        dictIO = IOobject
+        (
+            dictPath,
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        );
+    }
diff --git a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
new file mode 100644
index 0000000000..6e89f94c33
--- /dev/null
+++ b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
@@ -0,0 +1,33 @@
+//
+// setSystemMeshDictionaryIO.H
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    fileName dictPath = "";
+    if (args.optionFound("dict"))
+    {
+        dictPath = args["dict"];
+        if (isDir(dictPath))
+        {
+            dictPath = dictPath / dictName;
+        }
+    }
+
+    IOobject dictIO
+    (
+        dictName,
+        runTime.system(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    );
+
+    if (dictPath.size())
+    {
+        dictIO = IOobject
+        (
+            dictPath,
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        );
+    }
diff --git a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
new file mode 100644
index 0000000000..e594e83d96
--- /dev/null
+++ b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
@@ -0,0 +1,33 @@
+//
+// setSystemRunTimeDictionaryIO.H
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    fileName dictPath = "";
+    if (args.optionFound("dict"))
+    {
+        dictPath = args["dict"];
+        if (isDir(dictPath))
+        {
+            dictPath = dictPath / dictName;
+        }
+    }
+
+    IOobject dictIO
+    (
+        dictName,
+        runTime.system(),
+        runTime,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    );
+
+    if (dictPath.size())
+    {
+        dictIO = IOobject
+        (
+            dictPath,
+            runTime,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        );
+    }
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index a5def7bcc1..63d81a996f 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,23 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    snGrad scheme with limited non-orthogonal correction.
-
-    The limiter is controlled by a coefficient with a value between 0 and 1
-    which when 0 switches the correction off and the scheme behaves as
-    uncorrectedSnGrad, when set to 1 the full correction is applied and the
-    scheme behaves as correctedSnGrad and when set to 0.5 the limiter is
-    calculated such that the non-orthogonal contribution does not exceed the
-    orthogonal part.
-
 \*---------------------------------------------------------------------------*/
 
 #include "fv.H"
 #include "limitedSnGrad.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-#include "correctedSnGrad.H"
 #include "localMax.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +57,7 @@ limitedSnGrad<Type>::correction
 {
     const GeometricField<Type, fvsPatchField, surfaceMesh> corr
     (
-        correctedSnGrad<Type>(this->mesh()).correction(vf)
+        correctedScheme_().correction(vf)
     );
 
     const surfaceScalarField limiter
@@ -76,7 +65,7 @@ limitedSnGrad<Type>::correction
         min
         (
             limitCoeff_
-           *mag(snGradScheme<Type>::snGrad(vf, deltaCoeffs(vf), "orthSnGrad"))
+           *mag(snGradScheme<Type>::snGrad(vf, deltaCoeffs(vf), "SndGrad"))
            /(
                 (1 - limitCoeff_)*mag(corr)
               + dimensionedScalar("small", corr.dimensions(), SMALL)
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index 9dbe0f0114..5d1ffd2b94 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,14 +25,20 @@ Class
     Foam::fv::limitedSnGrad
 
 Description
-    Central-difference snGrad scheme with limited non-orthogonal correction.
+    Run-time selected snGrad scheme with limited non-orthogonal correction.
 
     The limiter is controlled by a coefficient with a value between 0 and 1
     which when 0 switches the correction off and the scheme behaves as
-    uncorrectedSnGrad, when set to 1 the full correction is applied and the
-    scheme behaves as correctedSnGrad and when set to 0.5 the limiter is
-    calculated such that the non-orthogonal contribution does not exceed the
-    orthogonal part.
+    uncorrectedSnGrad, when set to 1 the full correction of the selected scheme
+    is used and when set to 0.5 the limiter is calculated such that the
+    non-orthogonal contribution does not exceed the orthogonal part.
+
+    Format:
+        limited <corrected scheme> <coefficient>;
+
+        or
+
+        limited <coefficient>;  // Backward compatibility
 
 SourceFiles
     limitedSnGrad.C
@@ -42,7 +48,7 @@ SourceFiles
 #ifndef limitedSnGrad_H
 #define limitedSnGrad_H
 
-#include "snGradScheme.H"
+#include "correctedSnGrad.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,6 +71,8 @@ class limitedSnGrad
 {
     // Private data
 
+        tmp<snGradScheme<Type> > correctedScheme_;
+
         scalar limitCoeff_;
 
 
@@ -73,6 +81,34 @@ class limitedSnGrad
         //- Disallow default bitwise assignment
         void operator=(const limitedSnGrad&);
 
+        //- Lookup function for the corrected to support backward compatibility
+        //  of dictionary specification
+        tmp<snGradScheme<Type> > lookupCorrectedScheme(Istream& schemeData)
+        {
+            token nextToken(schemeData);
+
+            if (nextToken.isNumber())
+            {
+                limitCoeff_ = nextToken.number();
+                return tmp<snGradScheme<Type> >
+                (
+                    new correctedSnGrad<Type>(this->mesh())
+                );
+            }
+            else
+            {
+                schemeData.putBack(nextToken);
+                tmp<snGradScheme<Type> > tcorrectedScheme
+                (
+                    fv::snGradScheme<Type>::New(this->mesh(), schemeData)
+                );
+
+                schemeData >> limitCoeff_;
+
+                return tcorrectedScheme;
+            }
+        }
+
 
 public:
 
@@ -85,22 +121,24 @@ public:
         //- Construct from mesh
         limitedSnGrad(const fvMesh& mesh)
         :
-            snGradScheme<Type>(mesh)
+            snGradScheme<Type>(mesh),
+            correctedScheme_(new correctedSnGrad<Type>(this->mesh())),
+            limitCoeff_(1)
         {}
 
 
         //- Construct from mesh and data stream
-        limitedSnGrad(const fvMesh& mesh, Istream& is)
+        limitedSnGrad(const fvMesh& mesh, Istream& schemeData)
         :
             snGradScheme<Type>(mesh),
-            limitCoeff_(readScalar(is))
+            correctedScheme_(lookupCorrectedScheme(schemeData))
         {
             if (limitCoeff_ < 0 || limitCoeff_ > 1)
             {
                 FatalIOErrorIn
                 (
-                    "limitedSnGrad(const fvMesh& mesh, Istream& is) : ",
-                    is
+                    "limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : ",
+                    schemeData
                 )   << "limitCoeff is specified as " << limitCoeff_
                     << " but should be >= 0 && <= 1"
                     << exit(FatalIOError);
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 69c25178ed..d0e43dbb10 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2372,11 +2372,13 @@ void Foam::autoLayerDriver::getLayerCellsFaces
 Foam::autoLayerDriver::autoLayerDriver
 (
     meshRefinement& meshRefiner,
-    const labelList& globalToPatch
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch
 )
 :
     meshRefiner_(meshRefiner),
-    globalToPatch_(globalToPatch)
+    globalToMasterPatch_(globalToMasterPatch),
+    globalToSlavePatch_(globalToSlavePatch)
 {}
 
 
@@ -2435,7 +2437,12 @@ void Foam::autoLayerDriver::addLayers
     // Create baffles (pairs of faces that share the same points)
     // Baffles stored as owner and neighbour face that have been created.
     List<labelPair> baffles;
-    meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
+    meshRefiner_.createZoneBaffles
+    (
+        globalToMasterPatch_,
+        globalToSlavePatch_,
+        baffles
+    );
 
     if (debug&meshRefinement::MESH)
     {
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 272f1af09e..416544a719 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -99,7 +99,10 @@ class autoLayerDriver
         meshRefinement& meshRefiner_;
 
         //- From surface region to patch
-        const labelList globalToPatch_;
+        const labelList globalToMasterPatch_;
+
+        //- From surface region to patch
+        const labelList globalToSlavePatch_;
 
 
 
@@ -518,7 +521,8 @@ public:
         autoLayerDriver
         (
             meshRefinement& meshRefiner,
-            const labelList& globalToPatch
+            const labelList& globalToMasterPatch,
+            const labelList& globalToSlavePatch
         );
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 73d09f449f..8ffcaa5f57 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -1135,6 +1135,12 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
             << "    " << medialRatio.name()
             << " : ratio of medial distance to wall distance" << nl
             << endl;
+        meshRefiner_.mesh().setInstance(meshRefiner_.timeName());
+        meshRefiner_.write
+        (
+            debug,
+            mesh.time().path()/meshRefiner_.timeName()
+        );
         dispVec.write();
         medialDist.write();
         medialVec.write();
@@ -1409,6 +1415,94 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
             *dispVec[pointI];
     }
 
+
+
+//XXXXX
+//    // Smear displacement away from fixed values (medialRatio=0 or 1)
+//    {
+//        const edgeList& edges = mesh.edges();
+//        scalarField edgeWeight(edges.size(), 0.0);
+//        forAll(edges, edgeI)
+//        {
+//            if (isMasterEdge[edgeI])
+//            {
+//                scalar eMag = edges[edgeI].mag(mesh.points());
+//                if (eMag > VSMALL)
+//                {
+//                    edgeWeight[edgeI] = 1.0/eMag;
+//                }
+//                else
+//                {
+//                    edgeWeight[edgeI] = GREAT;
+//                }
+//            }
+//        }
+//        scalarField invSumWeight(mesh.nPoints());
+//        sumWeights(isMasterEdge, edgeWeight, invSumWeight);
+//
+//
+//        // Get smoothly varying patch field.
+//        Info<< "shrinkMeshDistance : Smoothing displacement ..." << endl;
+//
+//        const scalar lambda = 0.33;
+//        const scalar mu = -0.34;
+//
+//        pointField average(mesh.nPoints());
+//        for (label iter = 0; iter < 90; iter++)
+//        {
+//            // Calculate average of field
+//            averageNeighbours
+//            (
+//                mesh,
+//                edgeWeight,
+//                invSumWeight,
+//                displacement,
+//                average
+//            );
+//
+//            forAll(displacement, i)
+//            {
+//                if (medialRatio[i] > SMALL && medialRatio[i] < 1-SMALL)
+//                {
+//                    displacement[i] =
+//                        (1-lambda)*displacement[i]
+//                       +lambda*average[i];
+//                }
+//            }
+//
+//
+//            // Calculate average of field
+//            averageNeighbours
+//            (
+//                mesh,
+//                edgeWeight,
+//                invSumWeight,
+//                displacement,
+//                average
+//            );
+//
+//            forAll(displacement, i)
+//            {
+//                if (medialRatio[i] > SMALL && medialRatio[i] < 1-SMALL)
+//                {
+//                    displacement[i] = (1-mu)*displacement[i]+mu*average[i];
+//                }
+//            }
+//
+//
+//            // Do residual calculation every so often.
+//            if ((iter % 10) == 0)
+//            {
+//                Info<< "    Iteration " << iter << "   residual "
+//                    <<  gSum(mag(displacement-average))
+//                       /returnReduce(average.size(), sumOp<label>())
+//                    << endl;
+//            }
+//        }
+//    }
+//XXXXX
+
+
     if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
     {
         const_cast<Time&>(mesh.time())++;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index a5b663890c..3215e4b7e7 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -57,13 +57,15 @@ Foam::autoRefineDriver::autoRefineDriver
     meshRefinement& meshRefiner,
     decompositionMethod& decomposer,
     fvMeshDistribute& distributor,
-    const labelList& globalToPatch
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch
 )
 :
     meshRefiner_(meshRefiner),
     decomposer_(decomposer),
     distributor_(distributor),
-    globalToPatch_(globalToPatch)
+    globalToMasterPatch_(globalToMasterPatch),
+    globalToSlavePatch_(globalToSlavePatch)
 {}
 
 
@@ -313,7 +315,8 @@ void Foam::autoRefineDriver::removeInsideCells
     meshRefiner_.splitMesh
     (
         nBufferLayers,                  // nBufferLayers
-        globalToPatch_,
+        globalToMasterPatch_,
+        globalToSlavePatch_,
         refineParams.keepPoints()[0]
     );
 
@@ -521,7 +524,8 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
         !handleSnapProblems,            // merge free standing baffles?
         motionDict,
         const_cast<Time&>(mesh.time()),
-        globalToPatch_,
+        globalToMasterPatch_,
+        globalToSlavePatch_,
         refineParams.keepPoints()[0]
     );
 }
@@ -606,7 +610,8 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
         //true,                               // merge free standing baffles?
         motionDict,
         const_cast<Time&>(mesh.time()),
-        globalToPatch_,
+        globalToMasterPatch_,
+        globalToSlavePatch_,
         refineParams.keepPoints()[0]
     );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
index d75dd5daf5..37a0f6b102 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,10 @@ class autoRefineDriver
         fvMeshDistribute& distributor_;
 
         //- From surface region to patch
-        const labelList globalToPatch_;
+        const labelList globalToMasterPatch_;
+
+        //- From surface region to patch
+        const labelList globalToSlavePatch_;
 
 
     // Private Member Functions
@@ -146,7 +149,8 @@ public:
             meshRefinement& meshRefiner,
             decompositionMethod& decomposer,
             fvMeshDistribute& distributor,
-            const labelList& globalToPatch
+            const labelList& globalToMasterPatch,
+            const labelList& globalToSlavePatch
         );
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 54a78f477c..b7b79d715e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -573,11 +573,13 @@ bool Foam::autoSnapDriver::outwardsDisplacement
 Foam::autoSnapDriver::autoSnapDriver
 (
     meshRefinement& meshRefiner,
-    const labelList& globalToPatch
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch
 )
 :
     meshRefiner_(meshRefiner),
-    globalToPatch_(globalToPatch)
+    globalToMasterPatch_(globalToMasterPatch),
+    globalToSlavePatch_(globalToSlavePatch)
 {}
 
 
@@ -1191,7 +1193,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
 
             if (hitSurface[i] != -1 && !isZonedFace.get(faceI))
             {
-                closestPatch[i] = globalToPatch_
+                closestPatch[i] = globalToMasterPatch_
                 [
                     surfaces.globalRegion
                     (
@@ -1265,7 +1267,12 @@ void Foam::autoSnapDriver::doSnap
     // Create baffles (pairs of faces that share the same points)
     // Baffles stored as owner and neighbour face that have been created.
     List<labelPair> baffles;
-    meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
+    meshRefiner_.createZoneBaffles
+    (
+        globalToMasterPatch_,
+        globalToSlavePatch_,
+        baffles
+    );
 
 
     // Selectively 'forget' about the baffles, i.e. not check across them
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index e4cea95be2..e6763bc084 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -59,8 +59,11 @@ class autoSnapDriver
         //- Mesh+surface
         meshRefinement& meshRefiner_;
 
-        //- From surface region to patch
-        const labelList globalToPatch_;
+        //- From global surface region to master side patch
+        const labelList globalToMasterPatch_;
+
+        //- From global surface region to slave side patch
+        const labelList globalToSlavePatch_;
 
 
     // Private Member Functions
@@ -390,7 +393,8 @@ public:
         autoSnapDriver
         (
             meshRefinement& meshRefiner,
-            const labelList& globalToPatch
+            const labelList& globalToMasterPatch,
+            const labelList& globalToSlavePatch
         );
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index b9990cb078..7285c1ed00 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -573,7 +573,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
             pFc[i] = pp.faceCentres()[faceI];
             //label meshFaceI = pp.addressing()[faceI];
             //pFid[i] = mesh.boundaryMesh().whichPatch(meshFaceI);
-            pFid[i] = globalToPatch_[faceSurfaceGlobalRegion[faceI]];
+            pFid[i] = globalToMasterPatch_[faceSurfaceGlobalRegion[faceI]];
         }
     }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 26a40327d6..69cdf234cd 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -55,6 +55,7 @@ License
 #include "searchableSurfaces.H"
 #include "treeBoundBox.H"
 #include "zeroGradientFvPatchFields.H"
+#include "fvMeshTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1700,7 +1701,7 @@ Foam::label Foam::meshRefinement::addPatch
     oldToNew[addedPatchI] = insertPatchI;
 
     // Shuffle into place
-    polyPatches.reorder(oldToNew);
+    polyPatches.reorder(oldToNew, true);
     fvPatches.reorder(oldToNew);
 
     reorderPatchFields<volScalarField>(mesh, oldToNew);
@@ -1736,6 +1737,28 @@ Foam::label Foam::meshRefinement::addMeshedPatch
         // Add patch
         label patchI = addPatch(mesh_, name, patchInfo);
 
+//        dictionary patchDict(patchInfo);
+//        patchDict.set("nFaces", 0);
+//        patchDict.set("startFace", 0);
+//        autoPtr<polyPatch> ppPtr
+//        (
+//            polyPatch::New
+//            (
+//                name,
+//                patchDict,
+//                0,
+//                mesh_.boundaryMesh()
+//            )
+//        );
+//        label patchI = fvMeshTools::addPatch
+//        (
+//            mesh_,
+//            ppPtr(),
+//            dictionary(),       // optional field values
+//            calculatedFvPatchField<scalar>::typeName,
+//            true
+//        );
+
         // Store
         label sz = meshedPatches_.size();
         meshedPatches_.setSize(sz+1);
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index b98230e412..c265f05257 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -330,10 +330,11 @@ private:
         // Baffle handling
 
             //- Get faces to repatch. Returns map from face to patch.
-            Map<label> getZoneBafflePatches
+            Map<labelPair> getZoneBafflePatches
             (
                 const bool allowBoundary,
-                const labelList& globalToPatch
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch
             ) const;
 
             //- Geometric test on see whether face needs to be baffled:
@@ -349,7 +350,7 @@ private:
             //- Determine patches for baffles
             void getBafflePatches
             (
-                const labelList& globalToPatch,
+                const labelList& globalToMasterPatch,
                 const labelList& neiLevel,
                 const pointField& neiCc,
                 labelList& ownPatch,
@@ -426,7 +427,7 @@ private:
                 const dictionary& motionDict,
                 const bool removeEdgeConnectedCells,
                 const scalarField& perpendicularAngle,
-                const labelList& globalToPatch
+                const labelList& globalToMasterPatch
             ) const;
 
 
@@ -707,7 +708,8 @@ public:
                 const bool mergeFreeStanding,
                 const dictionary& motionDict,
                 Time& runTime,
-                const labelList& globalToPatch,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
                 const point& keepPoint
             );
 
@@ -716,7 +718,8 @@ public:
             autoPtr<mapPolyMesh> splitMesh
             (
                 const label nBufferLayers,
-                const labelList& globalToPatch,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
                 const point& keepPoint
             );
 
@@ -741,7 +744,8 @@ public:
             //  baffles.
             autoPtr<mapPolyMesh> createZoneBaffles
             (
-                const labelList& globalToPatch,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
                 List<labelPair>&
             );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index b9c189ffa0..11dde360eb 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -259,7 +259,7 @@ bool Foam::meshRefinement::validBaffleTopology
 // Determine patches for baffles on all intersected unnamed faces
 void Foam::meshRefinement::getBafflePatches
 (
-    const labelList& globalToPatch,
+    const labelList& globalToMasterPatch,
     const labelList& neiLevel,
     const pointField& neiCc,
 
@@ -376,11 +376,11 @@ void Foam::meshRefinement::getBafflePatches
             }
 
             // Pick up the patches
-            ownPatch[faceI] = globalToPatch
+            ownPatch[faceI] = globalToMasterPatch
             [
                 surfaces_.globalRegion(surface1[i], region1[i])
             ];
-            neiPatch[faceI] = globalToPatch
+            neiPatch[faceI] = globalToMasterPatch
             [
                 surfaces_.globalRegion(surface2[i], region2[i])
             ];
@@ -406,14 +406,14 @@ void Foam::meshRefinement::getBafflePatches
 }
 
 
-// Get faces to repatch. Returns map from face to patch.
-Foam::Map<Foam::label> Foam::meshRefinement::getZoneBafflePatches
+Foam::Map<Foam::labelPair>  Foam::meshRefinement::getZoneBafflePatches
 (
     const bool allowBoundary,
-    const labelList& globalToPatch
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch
 ) const
 {
-    Map<label> bafflePatch(mesh_.nFaces()/1000);
+    Map<labelPair> bafflePatch(mesh_.nFaces()/1000);
 
     const wordList& faceZoneNames = surfaces_.faceZoneNames();
     const faceZoneMesh& fZones = mesh_.faceZones();
@@ -427,40 +427,39 @@ Foam::Map<Foam::label> Foam::meshRefinement::getZoneBafflePatches
 
             const faceZone& fZone = fZones[zoneI];
 
-            //// Get patch allocated for zone
-            //label patchI = surfaceToCyclicPatch_[surfI];
-            // Get patch of (first region) of surface
-            label patchI = globalToPatch[surfaces_.globalRegion(surfI, 0)];
+            // Get patch allocated for zone
+            label globalRegionI = surfaces_.globalRegion(surfI, 0);
+            labelPair zPatches
+            (
+                globalToMasterPatch[globalRegionI],
+                globalToSlavePatch[globalRegionI]
+            );
 
-            Info<< "For surface "
-                << surfaces_.names()[surfI]
-                << " found faceZone " << fZone.name()
-                << " and patch " << mesh_.boundaryMesh()[patchI].name()
+            Info<< "For zone " << fZone.name() << " found patches "
+                << mesh_.boundaryMesh()[zPatches[0]].name() << " and "
+                << mesh_.boundaryMesh()[zPatches[1]].name()
                 << endl;
 
-
             forAll(fZone, i)
             {
                 label faceI = fZone[i];
 
                 if (allowBoundary || mesh_.isInternalFace(faceI))
                 {
-                    if (!bafflePatch.insert(faceI, patchI))
+                    labelPair patches = zPatches;
+                    if (fZone.flipMap()[i])
                     {
-                        label oldPatchI = bafflePatch[faceI];
+                       patches = patches.reversePair();
+                    }
 
-                        if (oldPatchI != patchI)
-                        {
-                            FatalErrorIn("getZoneBafflePatches(const bool)")
-                                << "Face " << faceI
-                                << " fc:" << mesh_.faceCentres()[faceI]
-                                << " in zone " << fZone.name()
-                                << " is in patch "
-                                << mesh_.boundaryMesh()[oldPatchI].name()
-                                << " and in patch "
-                                << mesh_.boundaryMesh()[patchI].name()
-                                << abort(FatalError);
-                        }
+                    if (!bafflePatch.insert(faceI, patches))
+                    {
+                        FatalErrorIn("getZoneBafflePatches(..)")
+                            << "Face " << faceI
+                            << " fc:" << mesh_.faceCentres()[faceI]
+                            << " in zone " << fZone.name()
+                            << " is in multiple zones!"
+                            << abort(FatalError);
                     }
                 }
             }
@@ -698,7 +697,8 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::getDuplicateFaces
 
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
 (
-    const labelList& globalToPatch,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
     List<labelPair>& baffles
 )
 {
@@ -714,20 +714,30 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
 
         // Get faces (internal only) to be baffled. Map from face to patch
         // label.
-        Map<label> faceToPatch(getZoneBafflePatches(false, globalToPatch));
+        Map<labelPair> faceToPatch
+        (
+            getZoneBafflePatches
+            (
+                false,
+                globalToMasterPatch,
+                globalToSlavePatch
+            )
+        );
 
         label nZoneFaces = returnReduce(faceToPatch.size(), sumOp<label>());
         if (nZoneFaces > 0)
         {
             // Convert into labelLists
             labelList ownPatch(mesh_.nFaces(), -1);
-            forAllConstIter(Map<label>, faceToPatch, iter)
+            labelList neiPatch(mesh_.nFaces(), -1);
+            forAllConstIter(Map<labelPair>, faceToPatch, iter)
             {
-                ownPatch[iter.key()] = iter();
+                ownPatch[iter.key()] = iter().first();
+                neiPatch[iter.key()] = iter().second();
             }
 
             // Create baffles. both sides same patch.
-            map = createBaffles(ownPatch, ownPatch);
+            map = createBaffles(ownPatch, neiPatch);
 
             // Get pairs of faces created.
             // Just loop over faceMap and store baffle if we encounter a slave
@@ -744,7 +754,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
                 label oldFaceI = faceMap[faceI];
 
                 // Does face originate from face-to-patch
-                Map<label>::const_iterator iter = faceToPatch.find(oldFaceI);
+                Map<labelPair>::const_iterator iter = faceToPatch.find
+                (
+                    oldFaceI
+                );
 
                 if (iter != faceToPatch.end())
                 {
@@ -1344,7 +1357,8 @@ void Foam::meshRefinement::findCellZoneGeometric
     // Sync
     syncTools::syncFaceList(mesh_, namedSurfaceIndex, maxEqOp<label>());
 }
-//XXXXXXXXX
+
+
 void Foam::meshRefinement::findCellZoneInsideWalk
 (
     const labelList& locationSurfaces,  // indices of surfaces with inside point
@@ -1446,7 +1460,6 @@ void Foam::meshRefinement::findCellZoneInsideWalk
         }
     }
 }
-//XXXXXXXXX
 
 
 bool Foam::meshRefinement::calcRegionToZone
@@ -1827,7 +1840,8 @@ void Foam::meshRefinement::baffleAndSplitMesh
     const bool mergeFreeStanding,
     const dictionary& motionDict,
     Time& runTime,
-    const labelList& globalToPatch,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
     const point& keepPoint
 )
 {
@@ -1849,7 +1863,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
     labelList ownPatch, neiPatch;
     getBafflePatches
     (
-        globalToPatch,
+        globalToMasterPatch,
         neiLevel,
         neiCc,
 
@@ -1899,7 +1913,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
                 motionDict,
                 removeEdgeConnectedCells,
                 perpendicularAngle,
-                globalToPatch
+                globalToMasterPatch
             )
             //markFacesOnProblemCellsGeometric(motionDict)
         );
@@ -1917,7 +1931,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
                     motionDict,
                     removeEdgeConnectedCells,
                     perpendicularAngle,
-                    globalToPatch
+                    globalToMasterPatch
                 )
             );
             forAll(facePatchTopo, faceI)
@@ -2051,7 +2065,8 @@ void Foam::meshRefinement::baffleAndSplitMesh
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 (
     const label nBufferLayers,
-    const labelList& globalToPatch,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
     const point& keepPoint
 )
 {
@@ -2066,7 +2081,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     labelList ownPatch, neiPatch;
     getBafflePatches
     (
-        globalToPatch,
+        globalToMasterPatch,
         neiLevel,
         neiCc,
 
@@ -2129,9 +2144,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 
     // Patch for exposed faces for lack of anything sensible.
     label defaultPatch = 0;
-    if (globalToPatch.size())
+    if (globalToMasterPatch.size())
     {
-        defaultPatch = globalToPatch[0];
+        defaultPatch = globalToMasterPatch[0];
     }
 
     for (label i = 0; i < nBufferLayers; i++)
diff --git a/src/postProcessing/postCalc/postCalc.C b/src/postProcessing/postCalc/postCalc.C
index ff2dd174e0..0dfb6bf957 100644
--- a/src/postProcessing/postCalc/postCalc.C
+++ b/src/postProcessing/postCalc/postCalc.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,12 +68,7 @@ int main(int argc, char *argv[])
         "noFlow",
         "suppress creating flow models (execFlowFunctionObjects only)"
     );
-    Foam::argList::addOption
-    (
-        "dict",
-        "name",
-        "dictionary to use"
-    );
+    #include "addDictOption.H"
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
index 2d46eb050d..a3dcbfcc2e 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
@@ -57,14 +57,14 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian((rho*inv((((1)*A(U))+tDragDcu))),p) Gauss linear limited 0.333;
-    laplacian(Db,b) Gauss linear limited 0.333;
-    laplacian(Db,ft) Gauss linear limited 0.333;
-    laplacian(Db,ha) Gauss linear limited 0.333;
-    laplacian(Db,hau) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian((rho*inv((((1)*A(U))+tDragDcu))),p) Gauss linear limited corrected 0.333;
+    laplacian(Db,b) Gauss linear limited corrected 0.333;
+    laplacian(Db,ft) Gauss linear limited corrected 0.333;
+    laplacian(Db,ha) Gauss linear limited corrected 0.333;
+    laplacian(Db,hau) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -74,7 +74,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index 9bfa83ecf5..a92565feff 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -58,7 +58,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.5;
+    default         Gauss linear limited corrected 0.5;
 }
 
 interpolationSchemes
@@ -68,7 +68,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.5;
+    default         limited corrected 0.5;
 }
 
 fluxRequired
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index ca4e9e4bd8..6763873c72 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -10,7 +10,7 @@ application=`getApplication`
 runApplication blockMesh
 
 runApplication topoSet -dict cRefine.topoSetDict
-runApplication refineMesh -overwrite -dict
+runApplication refineMesh -overwrite -dict system/refineMeshDict
 
 rm log.topoSet
 runApplication topoSet -dict f.topoSetDict
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index 02e15a0996..ec1368d9ca 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.5;
+    default         Gauss linear limited corrected 0.5;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 7a53eb9600..52d63773c0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(nuEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(kappaEff,T) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(nuEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(kappaEff,T) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 148fdb45eb..74a1cb4a71 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index a1071797a3..998b93b283 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
 laplacianSchemes
 {
     default             none;
-    laplacian(alpha,h)  Gauss linear limited 0.333;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -42,7 +42,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
index 44cdd8eb8c..8fc4915d8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
 laplacianSchemes
 {
     default                 none;
-    laplacian(alpha,h)      Gauss linear limited 0.333;
+    laplacian(alpha,h)      Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -42,7 +42,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
index e21e6d5b8c..d17c3fadce 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
 laplacianSchemes
 {
     default              none;
-    laplacian(alpha,h)   Gauss linear limited 0.333;
+    laplacian(alpha,h)   Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -42,7 +42,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index 5694ac1f59..8dce282ff2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
index 5694ac1f59..8dce282ff2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
index a1071797a3..998b93b283 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
 laplacianSchemes
 {
     default             none;
-    laplacian(alpha,h)  Gauss linear limited 0.333;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -42,7 +42,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
deleted file mode 120000
index 63236f302c..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
+++ /dev/null
@@ -1 +0,0 @@
-../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
new file mode 100644
index 0000000000..998b93b283
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
deleted file mode 120000
index 63236f302c..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
+++ /dev/null
@@ -1 +0,0 @@
-../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
new file mode 100644
index 0000000000..998b93b283
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
index 5694ac1f59..8dce282ff2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 5694ac1f59..8dce282ff2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index a1071797a3..998b93b283 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
 laplacianSchemes
 {
     default             none;
-    laplacian(alpha,h)  Gauss linear limited 0.333;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -42,7 +42,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
deleted file mode 120000
index 63236f302c..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
+++ /dev/null
@@ -1 +0,0 @@
-../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
new file mode 100644
index 0000000000..998b93b283
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
deleted file mode 120000
index 63236f302c..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
+++ /dev/null
@@ -1 +0,0 @@
-../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
new file mode 100644
index 0000000000..998b93b283
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index 5694ac1f59..8dce282ff2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
-    laplacian(alphaEff,h) Gauss linear limited 0.333;
-    laplacian(DkEff,k) Gauss linear limited 0.333;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
-    laplacian(DREff,R) Gauss linear limited 0.333;
+    laplacian(muEff,U) Gauss linear limited corrected 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
+    laplacian(alphaEff,h) Gauss linear limited corrected 0.333;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.333;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
+    laplacian(DREff,R) Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index 61fd0e371b..ecc9459467 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -23,7 +23,7 @@ done
 
 for i in bottomAir topAir
 do
-    faceAgglomerate -region $i -dict viewFactorsDict > log.faceAgglomerate.$i 2>&1
+    faceAgglomerate -region $i -dict constant/viewFactorsDict > log.faceAgglomerate.$i 2>&1
 done
 
 for i in bottomAir topAir
@@ -42,7 +42,7 @@ runApplication `getApplication`
 #
 #for i in bottomAir topAir
 #do
-#    mpirun -np 4 faceAgglomerate -region $i -dict viewFactorsDict -parallel>   log.faceAgglomerate.$i 2>&1
+#    mpirun -np 4 faceAgglomerate -region $i -dict constant/viewFactorsDict -parallel>   log.faceAgglomerate.$i 2>&1
 #done
 
 #for i in bottomAir topAir
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
index 9106eed273..b6ae74a4e9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.33;
+    default         Gauss linear limited corrected 0.33;
 }
 
 interpolationSchemes
@@ -49,7 +49,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.33;
+    default         limited corrected 0.33;
 }
 
 fluxRequired
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index 258bb383f2..953fe762d0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.5;
+    default         Gauss linear limited corrected 0.5;
 }
 
 interpolationSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index b12dc45dcf..bfd86f807a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -42,12 +42,12 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear limited 0.5;
-    laplacian(DkEff,k) Gauss linear limited 0.5;
-    laplacian(DREff,R) Gauss linear limited 0.5;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
-    laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
-    laplacian(alphaEff,e) Gauss linear limited 0.5;
+    laplacian(muEff,U) Gauss linear limited corrected 0.5;
+    laplacian(DkEff,k) Gauss linear limited corrected 0.5;
+    laplacian(DREff,R) Gauss linear limited corrected 0.5;
+    laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.5;
+    laplacian((rho*(1|A(U))),p) Gauss linear limited corrected 0.5;
+    laplacian(alphaEff,e) Gauss linear limited corrected 0.5;
 }
 
 interpolationSchemes
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
index 92c3f3dd82..544288617f 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
@@ -85,43 +85,7 @@ baffles
                 name            baffles;
                 type            wall;
 
-                patchFields
-                {
-                    epsilon
-                    {
-                        type            epsilonWallFunction;
-                        Cmu             0.09;
-                        kappa           0.41;
-                        E               9.8;
-                        value           uniform 0;
-                    }
-                    k
-                    {
-                        type            kqRWallFunction;
-                        value           uniform 0;
-                    }
-                    nut
-                    {
-                        type            nutkWallFunction;
-                        Cmu             0.09;
-                        kappa           0.41;
-                        E               9.8;
-                        value           uniform 0;
-                    }
-                    nuTilda
-                    {
-                        type            zeroGradient;
-                    }
-                    p
-                    {
-                        type            zeroGradient;
-                    }
-                    U
-                    {
-                        type            fixedValue;
-                        value           uniform (0 0 0);
-                    }
-                }
+                ${..master.patchFields}
             }
         }
     }
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index 656b92f3ad..f4d2c06b94 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -15,7 +15,7 @@ runApplication mirrorMesh -overwrite
 rm log.mirrorMesh
 
 rm log.changeDictionary
-runApplication changeDictionary -instance system -dict  system/changeDictionaryDict.Y
+runApplication changeDictionary -instance system -dict system/changeDictionaryDict.Y
 
 runApplication mirrorMesh -overwrite
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
index 3d223e01d6..03be7b49e0 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
@@ -45,7 +45,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.33;
+    default         Gauss linear limited corrected 0.33;
 }
 
 interpolationSchemes
@@ -55,7 +55,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.33;
+    default         limited corrected 0.33;
 }
 
 fluxRequired
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
index 774f507b64..492b79ef74 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default             Gauss linear limited 0.333;
+    default             Gauss linear limited corrected 0.333;
 }
 
 interpolationSchemes
@@ -45,7 +45,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default             limited 0.333;
+    default             limited corrected 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
index bdeacd7831..8d214a96af 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
@@ -18,7 +18,7 @@ refineMeshByCellSet()
           topoSet > log.topoSet.$1 2>&1
 
           echo "refining primary zone - $1"
-          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+          refineMesh -dict system/refineMeshDict -overwrite > log.refineMesh.$1 2>&1
       fi
       shift
    done
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
index 213a2a5ecf..a6b927d81a 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
@@ -18,7 +18,7 @@ refineMeshByCellSet()
           topoSet > log.topoSet.$1 2>&1
 
           echo "refining primary zone - $1"
-          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+          refineMesh -dict sytem/refineMeshDict -overwrite > log.refineMesh.$1 2>&1
       fi
       shift
    done
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 37600b5049..fb8009740b 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -17,7 +17,7 @@ refineMeshByCellSet()
           topoSet > log.topoSet.$1 2>&1
 
           echo "refining primary zone - $1"
-          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+          refineMesh -dict system/refineMeshDict -overwrite > log.refineMesh.$1 2>&1
       fi
       shift
    done
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index a66f56c1a7..bdd17ed033 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -10,7 +10,7 @@ application=`getApplication`
 runRefineMesh ()
 {
     echo "Running refineMesh on $PWD"
-    refineMesh -dict > log.refineMesh 2>&1
+    refineMesh -dict system/refineMeshDict > log.refineMesh 2>&1
 }
 
 runApplication blockMesh
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
index 46e0c66bf8..c127ff67d2 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
@@ -65,10 +65,7 @@ baffles
                 type            cyclic;
                 neighbourPatch  porous_half0;
 
-                patchFields
-                {
-                    ${...master.patchFields}
-                }
+                ${..master.patchFields}
             }
         }
     }
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
index e0e6b776a2..34da39d900 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
@@ -21,5 +21,4 @@ turbulence      on;
 
 printCoeffs     on;
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index 44313d502d..9143f603f4 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -42,15 +42,15 @@ gradSchemes
 
 laplacianSchemes
 {
-    default              Gauss linear limited 0.5;
+    default              Gauss linear limited corrected 0.5;
 }
 
 snGradSchemes
 {
     default              none;
-    snGrad(pd)           limited 0.5;
-    snGrad(rho)          limited 0.5;
-    snGrad(alpha1)       limited 0.5;
+    snGrad(pd)           limited corrected 0.5;
+    snGrad(rho)          limited corrected 0.5;
+    snGrad(alpha1)       limited corrected 0.5;
 }
 
 fluxRequired