diff --git a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
index 401917f55..02b48f8d2 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
@@ -9,7 +9,7 @@ IOobject phiBHeader
 
 surfaceScalarField* phiBPtr = nullptr;
 
-if (phiBHeader.headerOk())
+if (phiBHeader.typeHeaderOk<surfaceScalarField>(true))
 {
     Info<< "Reading face flux ";
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
deleted file mode 120000
index f2ec2a0ce..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
+++ /dev/null
@@ -1 +0,0 @@
-../../fluid/residualControlsFluid.H
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
new file mode 100644
index 000000000..fa95ed86e
--- /dev/null
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
@@ -0,0 +1,56 @@
+// Residual control used
+if (residualControlUsed)
+{
+    bool UConv = false;
+    bool p_rghConv = false;
+    bool EConv = false;
+
+    // Check which field is not used for control
+    {
+        if (UTol == -1 || !momentumPredictor)
+        {
+            UConv =  true;
+        }
+
+        if (p_rghTol == -1)
+        {
+            p_rghConv = true;
+        }
+
+        if (ETol == -1)
+        {
+            EConv = true;
+        }
+    }
+
+    // Get the last initial residual of the solvers
+    if (momentumPredictor && !UConv)
+    {
+        if (UTol > cmptMax(solvPerfU.initialResidual()))
+        {
+            UConv = true;
+        }
+    }
+
+    if (!p_rghConv)
+    {
+        if (p_rghTol > solvPerfp_rgh.initialResidual())
+        {
+            p_rghConv = true;
+        }
+    }
+
+    if (!EConv)
+    {
+        if (ETol > solvPerfE.initialResidual())
+        {
+            EConv = true;
+        }
+    }
+
+    // Check if each field is converged
+    if (UConv && p_rghConv && EConv)
+    {
+        resReachedFluid = true;
+    }
+}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index 82261f535..857f97f24 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -79,7 +79,7 @@
             IOobject::AUTO_WRITE
         );
 
-        if (betavSolidIO.headerOk())
+        if (betavSolidIO.typeHeaderOk<volScalarField>(true))
         {
             betavSolid.set
             (
diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
index 73a157fc1..e7da9c6af 100644
--- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
+++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
@@ -11,7 +11,7 @@ IOobject turbulencePropertiesHeader
     false
 );
 
-if (turbulencePropertiesHeader.headerOk())
+if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(true))
 {
     autoPtr<compressible::turbulenceModel> turbulence
     (
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index d2be5bdd0..77287eed8 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -81,7 +81,7 @@ IOobject Hheader
 
 autoPtr<volVectorField> HPtr;
 
-if (Hheader.headerOk())
+if (Hheader.typeHeaderOk<volVectorField>(true))
 {
     Info<< "\nReading field H\n" << endl;
 
@@ -99,7 +99,7 @@ IOobject HdotGradHheader
 
 autoPtr<volVectorField> HdotGradHPtr;
 
-if (HdotGradHheader.headerOk())
+if (HdotGradHheader.typeHeaderOk<volVectorField>(true))
 {
     Info<< "Reading field HdotGradH" << endl;
 
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H
index abaede938..731a8196d 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H
@@ -11,7 +11,13 @@
 
     autoPtr<uniformDimensionedVectorField> linearAccelerationPtr;
 
-    if (linearAccelerationHeader.headerOk())
+    if
+    (
+        linearAccelerationHeader.typeHeaderOk<uniformDimensionedVectorField>
+        (
+            true
+        )
+    )
     {
         Info<< "    Reading " << linearAccelerationHeader.name() << endl;
 
@@ -33,7 +39,7 @@
 
     autoPtr<uniformDimensionedVectorField> angularVelocityPtr;
 
-    if (angularVelocityHeader.headerOk())
+    if (angularVelocityHeader.typeHeaderOk<uniformDimensionedVectorField>(true))
     {
         Info<< "    Reading " << angularVelocityHeader.name() << endl;
 
@@ -55,7 +61,13 @@
 
     autoPtr<uniformDimensionedVectorField> angularAccelerationPtr;
 
-    if (angularAccelerationHeader.headerOk())
+    if
+    (
+        angularAccelerationHeader.typeHeaderOk<uniformDimensionedVectorField>
+        (
+            true
+        )
+    )
     {
         Info<< "    Reading " << angularAccelerationHeader.name() << endl;
 
@@ -77,7 +89,13 @@
 
     autoPtr<uniformDimensionedVectorField> centreOfRotationPtr;
 
-    if (centreOfRotationHeader.headerOk())
+    if
+    (
+        centreOfRotationHeader.typeHeaderOk<uniformDimensionedVectorField>
+        (
+            true
+        )
+    )
     {
         Info<< "    Reading " << centreOfRotationHeader.name() << endl;
 
diff --git a/applications/solvers/multiphase/VoF/createAlphaFluxes.H b/applications/solvers/multiphase/VoF/createAlphaFluxes.H
index 2bf716cc5..72da18386 100644
--- a/applications/solvers/multiphase/VoF/createAlphaFluxes.H
+++ b/applications/solvers/multiphase/VoF/createAlphaFluxes.H
@@ -7,7 +7,7 @@ IOobject alphaPhi10Header
     IOobject::AUTO_WRITE
 );
 
-const bool alphaRestart = alphaPhi10Header.headerOk();
+const bool alphaRestart = alphaPhi10Header.typeHeaderOk<surfaceScalarField>();
 
 // MULES flux from previous time-step
 surfaceScalarField alphaPhi10
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 1751e404a..a1990a88c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -123,7 +123,7 @@ Foam::phaseModel::phaseModel
         IOobject::NO_READ
     );
 
-    if (phiHeader.headerOk())
+    if (phiHeader.typeHeaderOk<surfaceScalarField>(true))
     {
         Info<< "Reading face flux field " << phiName << endl;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 6e5aac34d..0aa04c362 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
         IOobject::NO_READ
     );
 
-    if (phiHeader.headerOk())
+    if (phiHeader.typeHeaderOk<surfaceScalarField>(true))
     {
         Info<< "Reading face flux field " << phiName << endl;
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
index dab711fb2..87a249277 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
@@ -121,7 +121,7 @@ Foam::phaseModel::phaseModel
         IOobject::NO_READ
     );
 
-    if (phiHeader.headerOk())
+    if (phiHeader.typeHeaderOk<surfaceScalarField>(true))
     {
         Info<< "Reading face flux field " << phiName << endl;
 
diff --git a/applications/test/CompactIOList/Test-CompactIOList.C b/applications/test/CompactIOList/Test-CompactIOList.C
index 12d64c6bd..2024e663e 100644
--- a/applications/test/CompactIOList/Test-CompactIOList.C
+++ b/applications/test/CompactIOList/Test-CompactIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,8 @@ int main(int argc, char *argv[])
         (
             format,
             IOstream::currentVersion,
-            IOstream::UNCOMPRESSED
+            IOstream::UNCOMPRESSED,
+            true
         );
 
         Info<< "Written old format faceList in = "
@@ -149,7 +150,8 @@ int main(int argc, char *argv[])
         (
             format,
             IOstream::currentVersion,
-            IOstream::UNCOMPRESSED
+            IOstream::UNCOMPRESSED,
+            true
         );
 
         Info<< "Written new format faceList in = "
diff --git a/applications/test/IOField/Make/files b/applications/test/IOField/Make/files
new file mode 100644
index 000000000..74e614dea
--- /dev/null
+++ b/applications/test/IOField/Make/files
@@ -0,0 +1,3 @@
+Test-IOField.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-IOField
diff --git a/applications/test/IOField/Make/options b/applications/test/IOField/Make/options
new file mode 100644
index 000000000..6a9e9810b
--- /dev/null
+++ b/applications/test/IOField/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
+/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/IOField/Test-IOField.C b/applications/test/IOField/Test-IOField.C
new file mode 100644
index 000000000..d49acaf8f
--- /dev/null
+++ b/applications/test/IOField/Test-IOField.C
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-IOField
+
+Description
+    Test the processor-local reading of IOField (used in the lagrangian libs)
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOField.H"
+#include "argList.H"
+#include "polyMesh.H"
+#include "Time.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void write(const IOobject& io, const label sz)
+{
+    IOField<label> fld(io, sz);
+    forAll(fld, i)
+    {
+        fld[i] = i+1000;
+    }
+    Pout<< "writing:" << fld << endl;
+    fld.write(sz > 0);
+}
+
+
+void read(const IOobject& io, const label sz)
+{
+    bool valid = (sz > 0);
+    Pout<< "    valid:" << valid << endl;
+    IOField<label> fld(io, valid);
+    Pout<< "    wanted:" << sz << " actually read:" << fld.size() << endl;
+
+    if (fld.size() != sz)
+    {
+        FatalErrorInFunction<< "io:" << io.objectPath() << exit(FatalError);
+    }
+}
+
+
+void writeAndRead
+(
+    const IOobject& io,
+    const label sz,
+    const word& writeType,
+    const IOobject::readOption readOpt,
+    const word& readType
+)
+{
+    Pout<< "** Writing:" << writeType
+        << " Reading:" << readType << endl;
+
+    autoPtr<fileOperation> writeHandler(fileOperation::New(writeType));
+    fileHandler(writeHandler);
+
+    // Delete
+    Pout<< "Deleting:" << fileHandler().filePath(io.objectPath()) << endl;
+    fileHandler().rm(fileHandler().filePath(io.objectPath()));
+
+    // Write
+    Pout<< "Writing:" << fileHandler().objectPath(io) << endl;
+    write(io, sz);
+
+    autoPtr<fileOperation> readHandler(fileOperation::New(readType));
+    fileHandler(readHandler);
+
+    // Read
+    IOobject readIO(io);
+    readIO.readOpt() = readOpt;
+    Pout<< "Reading:" << fileHandler().filePath(readIO.objectPath()) << endl;
+    read(readIO, sz);
+
+    Pout<< "** Done writing:" << writeType
+        << " Reading:" << readType << endl << endl << endl;
+}
+
+
+void readIfPresent
+(
+    IOobject& io,
+    const label sz,
+    const word& readType
+)
+{
+    autoPtr<fileOperation> readHandler(fileOperation::New(readType));
+    fileHandler(readHandler);
+
+    // Read
+    Pout<< "Reading:" << fileHandler().filePath(io.objectPath()) << endl;
+    io.readOpt() = IOobject::READ_IF_PRESENT;
+    read(io, sz);
+}
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    #include "addTimeOptions.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createPolyMesh.H"
+
+    label sz = 0;
+    if (Pstream::myProcNo() % 2)
+    {
+        sz = 1;
+    }
+
+    IOobject io
+    (
+        "bla",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    );
+
+    wordList handlers
+    (
+        Foam::fileOperation::wordConstructorTablePtr_->sortedToc()
+    );
+
+    Info<< "Found handlers:" << handlers << endl;
+
+
+/*
+    forAll(handlers, readi)
+    {
+        const word& readHandler = handlers[readi];
+
+        readIfPresent(io, sz, readHandler);
+    }
+*/
+
+
+    forAll(handlers, writei)
+    {
+        const word& writeHandler = handlers[writei];
+
+        forAll(handlers, readi)
+        {
+            const word& readHandler = handlers[readi];
+
+            writeAndRead
+            (
+                io,
+                sz,
+                writeHandler,
+                IOobject::READ_IF_PRESENT,
+                readHandler
+            );
+        }
+    }
+
+
+    Pout<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/decomposedBlockData/Make/files b/applications/test/decomposedBlockData/Make/files
new file mode 100644
index 000000000..3d33e10b6
--- /dev/null
+++ b/applications/test/decomposedBlockData/Make/files
@@ -0,0 +1,3 @@
+Test-decomposedBlockData.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-decomposedBlockData
diff --git a/applications/test/decomposedBlockData/Make/options b/applications/test/decomposedBlockData/Make/options
new file mode 100644
index 000000000..e69de29bb
diff --git a/applications/test/decomposedBlockData/Test-decomposedBlockData.C b/applications/test/decomposedBlockData/Test-decomposedBlockData.C
new file mode 100644
index 000000000..1c8676549
--- /dev/null
+++ b/applications/test/decomposedBlockData/Test-decomposedBlockData.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-decomposedBlockData
+
+Description
+    Convert decomposedBlockData into its components.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "decomposedBlockData.H"
+#include "OFstream.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::validArgs.append("file");
+    #include "setRootCase.H"
+
+    if (!Pstream::parRun())
+    {
+        FatalErrorInFunction
+            << "Run in parallel" << exit(FatalError);
+    }
+
+    #include "createTime.H"
+
+    const fileName file(args[1]);
+
+    Info<< "Reading " << file << nl << endl;
+    decomposedBlockData data
+    (
+        Pstream::worldComm,
+        IOobject
+        (
+            file,
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    data.rename(data.name() + "Data");
+    fileName objPath(data.objectPath());
+    mkDir(objPath.path());
+    Info<< "Opening output file " << objPath << nl << endl;
+    OFstream os
+    (
+        objPath,
+        IOstream::BINARY,
+        IOstream::currentVersion,
+        runTime.writeCompression()
+    );
+    if (!os.good())
+    {
+        FatalErrorInFunction
+            << "Failed opening " << objPath << exit(FatalError);
+    }
+
+    if (!data.writeData(os))
+    {
+        FatalErrorInFunction
+            << "Failed writing " << objPath << exit(FatalError);
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 7f8cb092b..d1b5e9cde 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ Description
 #include "emptyPolyPatch.H"
 #include "removeCells.H"
 #include "meshSearch.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
@@ -650,7 +651,7 @@ int main(int argc, char *argv[])
     // corrector for mesh motion
     twoDPointCorrector* correct2DPtr = nullptr;
 
-    if (motionObj.headerOk())
+    if (motionObj.typeHeaderOk<IOdictionary>(true))
     {
         Info<< "Reading " << runTime.constant() / "motionProperties"
             << endl << endl;
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 5277498ee..00240beb1 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,7 @@ Description
 #include "meshTools.H"
 #include "Pair.H"
 #include "globalIndex.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 285b14be6..64ea653ec 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
         runTime
     );
 
-    if (!readLevel && refHeader.headerOk())
+    if (!readLevel && refHeader.typeHeaderOk<labelIOList>(true))
     {
         WarningInFunction
             << "Detected " << refHeader.name() << " file in "
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.C b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
index 2affa4053..bf56a995e 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.C
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,7 @@ License
 #include "polyMesh.H"
 #include "Ostream.H"
 #include "twoDPointCorrector.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -82,7 +83,7 @@ Foam::edgeStats::edgeStats(const polyMesh& mesh)
         IOobject::NO_WRITE
     );
 
-    if (motionObj.headerOk())
+    if (motionObj.typeHeaderOk<IOdictionary>(true))
     {
         Info<< "Reading " << mesh.time().constant() / "motionProperties"
             << endl << endl;
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index 0570ff62b..551d894da 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ See also
 #include "Time.H"
 #include "polyMesh.H"
 #include "STARCDMeshWriter.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
index 4303a8272..22b31b514 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
@@ -19,7 +19,7 @@
             false
         );
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<IOdictionary>(true))
         {
             IOdictionary timeObject
             (
diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
index e93913a66..3a17db806 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
+++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
@@ -44,7 +44,7 @@ Usage
 #include "timeSelector.H"
 #include "Time.H"
 #include "polyMesh.H"
-
+#include "IOdictionary.H"
 #include "MeshedSurfaces.H"
 
 using namespace Foam;
diff --git a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
index 4303a8272..22b31b514 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
@@ -19,7 +19,7 @@
             false
         );
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<IOdictionary>(true))
         {
             IOdictionary timeObject
             (
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index 4b3b72660..fef6cc320 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
         false
     );
 
-    if (!meshDictIO.headerOk())
+    if (!meshDictIO.typeHeaderOk<IOdictionary>(true))
     {
         FatalErrorInFunction
             << meshDictIO.objectPath()
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 2d2d68c8d..ad8b944d0 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
 
         Info<< "Testing:" << io.objectPath() << endl;
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(false))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
             dictionary dummyDict;
@@ -122,7 +122,7 @@ void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
             false
         );
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(false))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
             dictionary dummyDict;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 29969e66c..a4f866711 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -366,7 +366,7 @@ void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
 
         Info<< "Testing:" << io.objectPath() << endl;
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(true))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
             dictionary dummyDict;
@@ -392,7 +392,7 @@ void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
             false
         );
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(true))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
             dictionary dummyDict;
@@ -2657,7 +2657,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::MUST_READ
         );
-        if (io.headerOk())
+        if (io.typeHeaderOk<pointIOField>(true))
         {
             // Read patchFaceCentres and patchEdgeCentres
             Info<< "Reading patch face,edge centres : "
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
index a7c05cc8b..5910336f7 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
@@ -44,6 +44,7 @@ Note
 #include "addPatchCellLayer.H"
 #include "patchToPoly2DMesh.H"
 #include "globalIndex.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 42ff66646..70bbb2e4b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -387,7 +387,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Triangulation::number_of_vertices()
+        label(Triangulation::number_of_vertices())
     );
 
     labelIOField processorIndices
@@ -401,7 +401,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        Triangulation::number_of_vertices()
+        label(Triangulation::number_of_vertices())
     );
 
     for
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 277189151..fbd1f2ccf 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -525,6 +525,7 @@ void extractSurface
           ? runTime.path()/".."/outFileName
           : runTime.path()/outFileName
         );
+        globalCasePath.clean();
 
         Info<< "Writing merged surface to " << globalCasePath << endl;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index dbcc641e6..dd3092e7b 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,7 @@ Usage
 #include "globalMeshData.H"
 #include "surfaceWriter.H"
 #include "vtkSetWriter.H"
+#include "IOdictionary.H"
 
 #include "checkTools.H"
 #include "checkTopology.H"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
index 3f65097b4..b9f2abd71 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -268,7 +268,7 @@ void Foam::mergeAndWrite
         mesh.points()
     );
 
-    const fileName outputDir
+    fileName outputDir
     (
         set.time().path()
       / (Pstream::parRun() ? ".." : "")
@@ -276,6 +276,7 @@ void Foam::mergeAndWrite
       / mesh.pointsInstance()
       / set.name()
     );
+    outputDir.clean();
 
     mergeAndWrite(mesh, writer, set.name(), setPatch, outputDir);
 }
@@ -361,7 +362,7 @@ void Foam::mergeAndWrite
         mesh.points()
     );
 
-    const fileName outputDir
+    fileName outputDir
     (
         set.time().path()
       / (Pstream::parRun() ? ".." : "")
@@ -369,6 +370,7 @@ void Foam::mergeAndWrite
       / mesh.pointsInstance()
       / set.name()
     );
+    outputDir.clean();
 
     mergeAndWrite(mesh, writer, set.name(), setPatch, outputDir);
 }
@@ -464,7 +466,7 @@ void Foam::mergeAndWrite
 
         // Output e.g. pointSet p0 to
         // postProcessing/<time>/p0.vtk
-        const fileName outputDir
+        fileName outputDir
         (
             set.time().path()
           / (Pstream::parRun() ? ".." : "")
@@ -472,6 +474,7 @@ void Foam::mergeAndWrite
           / mesh.pointsInstance()
           // set.name()
         );
+        outputDir.clean();
         mkDir(outputDir);
 
         fileName outputFile(outputDir/writer.getFileName(points, wordList()));
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index a756692b2..f240270b7 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -49,6 +49,7 @@ Description
 #include "polyTopoChange.H"
 #include "polyModifyFace.H"
 #include "wordReList.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index 7afea5860..7086e60bd 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
         );
 
         // Check U exists
-        if (Uheader.headerOk())
+        if (Uheader.typeHeaderOk<volVectorField>(true))
         {
             Info<< "    Reading U" << endl;
             volVectorField U(Uheader, mesh);
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index debcd9f09..493cd0c4a 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,7 @@ Description
 #include "wedgePolyPatch.H"
 #include "plane.H"
 #include "SubField.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
@@ -187,7 +188,7 @@ int main(int argc, char *argv[])
             IOobject::MUST_READ
         );
 
-        if (!dictIO.headerOk())
+        if (!dictIO.typeHeaderOk<IOdictionary>(true))
         {
             FatalErrorInFunction
                 << "Cannot open specified refinement dictionary "
@@ -209,7 +210,7 @@ int main(int argc, char *argv[])
             IOobject::MUST_READ
         );
 
-        if (dictIO.headerOk())
+        if (dictIO.typeHeaderOk<IOdictionary>(true))
         {
             Info<< "Refining according to " << dictName << nl << endl;
 
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index cda9ec129..f425a201f 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,7 @@ Description
 #include "faceZoneSet.H"
 #include "pointZoneSet.H"
 #include "timeSelector.H"
+#include "collatedFileOperation.H"
 
 #include <stdio.h>
 
@@ -805,6 +806,11 @@ commandStatus parseAction(const word& actionName)
 
 int main(int argc, char *argv[])
 {
+    // Specific to topoSet/setSet: quite often we want to block upon writing
+    // a set so we can immediately re-read it. So avoid use of threading
+    // for set writing.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
     timeSelector::addOptions(true, false);
     #include "addRegionOption.H"
     argList::addBoolOption("noVTK", "do not write VTK files");
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index ae9c83429..1e3f7c630 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -603,7 +603,7 @@ autoPtr<mapPolyMesh> createRegionMesh
 
         Info<< "Testing:" << io.objectPath() << endl;
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(true))
         // if (!exists(io.objectPath()))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
@@ -630,7 +630,7 @@ autoPtr<mapPolyMesh> createRegionMesh
             false
         );
 
-        if (!io.headerOk())
+        if (!io.typeHeaderOk<IOdictionary>(true))
         //if (!exists(io.objectPath()))
         {
             Info<< "Writing dummy " << regionName/io.name() << endl;
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 088ccbabe..84f4cfea0 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -483,7 +483,8 @@ int main(int argc, char *argv[])
         (
             runTime.writeFormat(),
             IOstream::currentVersion,
-            runTime.writeCompression()
+            runTime.writeCompression(),
+            true
         )
     )
     {
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index c05958e4e..e4aa0eb77 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,8 @@ Description
 #include "cellZoneSet.H"
 #include "faceZoneSet.H"
 #include "pointZoneSet.H"
+#include "IOdictionary.H"
+#include "collatedFileOperation.H"
 
 using namespace Foam;
 
@@ -191,6 +193,11 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
 
 int main(int argc, char *argv[])
 {
+    // Specific to topoSet/setSet: quite often we want to block upon writing
+    // a set so we can immediately re-read it. So avoid use of threading
+    // for set writing.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
     timeSelector::addOptions(true, false);
     #include "addDictOption.H"
     #include "addRegionOption.H"
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 62bb65f89..4b2c62706 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,9 +49,19 @@ Description
 #include "cellIOList.H"
 #include "IOobjectList.H"
 #include "IOPtrList.H"
+#include "cloud.H"
+#include "labelIOField.H"
+#include "scalarIOField.H"
+#include "sphericalTensorIOField.H"
+#include "symmTensorIOField.H"
+#include "tensorIOField.H"
+#include "labelFieldIOField.H"
+#include "vectorFieldIOField.H"
+#include "Cloud.H"
+#include "passiveParticle.H"
+#include "fieldDictionary.H"
 
 #include "writeMeshObject.H"
-#include "fieldDictionary.H"
 
 using namespace Foam;
 
@@ -79,7 +89,7 @@ bool writeZones(const word& name, const fileName& meshDir, Time& runTime)
 
     bool writeOk = false;
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<cellZoneMesh>(false))
     {
         Info<< "        Reading " << io.headerClassName()
             << " : " << name << endl;
@@ -130,7 +140,8 @@ bool writeZones(const word& name, const fileName& meshDir, Time& runTime)
         (
             IOstream::ASCII,
             IOstream::currentVersion,
-            runTime.writeCompression()
+            runTime.writeCompression(),
+            true
         );
     }
 
@@ -138,6 +149,75 @@ bool writeZones(const word& name, const fileName& meshDir, Time& runTime)
 }
 
 
+// Reduction for non-empty strings
+class uniqueEqOp
+{
+    public:
+    void operator()(stringList& x, const stringList& y) const
+    {
+        stringList newX(x.size()+y.size());
+        label n = 0;
+        forAll(x, i)
+        {
+            if (!x[i].empty())
+            {
+                newX[n++] = x[i];
+            }
+        }
+        forAll(y, i)
+        {
+            if (!y[i].empty() && findIndex(x, y[i]) == -1)
+            {
+                newX[n++] = y[i];
+            }
+        }
+        newX.setSize(n);
+        x.transfer(newX);
+    }
+};
+
+
+template<class T>
+bool writeOptionalMeshObject
+(
+    const word& name,
+    const fileName& meshDir,
+    Time& runTime,
+    const bool valid
+)
+{
+    IOobject io
+    (
+        name,
+        runTime.timeName(),
+        meshDir,
+        runTime,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    bool writeOk = false;
+
+    bool haveFile = io.typeHeaderOk<IOField<label>>(false);
+
+    // Make sure all know if there is a valid class name
+    stringList classNames(1, io.headerClassName());
+    combineReduce(classNames, uniqueEqOp());
+
+    // Check for correct type
+    if (classNames[0] == T::typeName)
+    {
+        Info<< "        Reading " << classNames[0]
+            << " : " << name << endl;
+        T meshObject(io, valid && haveFile);
+
+        Info<< "        Writing " << name << endl;
+        writeOk = meshObject.regIOobject::write(valid && haveFile);
+    }
+
+    return writeOk;
+}
 
 
 int main(int argc, char *argv[])
@@ -165,6 +245,8 @@ int main(int argc, char *argv[])
 
 
     #include "createTime.H"
+    // Optional mesh (used to read Clouds)
+    autoPtr<polyMesh> meshPtr;
 
 
     // Make sure we do not use the master-only reading since we read
@@ -190,11 +272,24 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << endl;
 
         // Convert all the standard mesh files
-        writeMeshObject<cellCompactIOList>("cells", meshDir, runTime);
+        writeMeshObject<cellCompactIOList, cellIOList>
+        (
+            "cells",
+            meshDir,
+            runTime
+        );
         writeMeshObject<labelIOList>("owner", meshDir, runTime);
         writeMeshObject<labelIOList>("neighbour", meshDir, runTime);
-        writeMeshObject<faceCompactIOList>("faces", meshDir, runTime);
+        writeMeshObject<faceCompactIOList, faceIOList>
+        (
+            "faces",
+            meshDir,
+            runTime
+        );
         writeMeshObject<pointIOField>("points", meshDir, runTime);
+        // Write boundary in ascii. This is only needed for fileHandler to
+        // kick in. Should not give problems since always writing ascii.
+        writeZones("boundary", meshDir, runTime);
         writeMeshObject<labelIOList>("pointProcAddressing", meshDir, runTime);
         writeMeshObject<labelIOList>("faceProcAddressing", meshDir, runTime);
         writeMeshObject<labelIOList>("cellProcAddressing", meshDir, runTime);
@@ -248,22 +343,196 @@ int main(int argc, char *argv[])
              || headerClassName == pointSphericalTensorField::typeName
              || headerClassName == pointSymmTensorField::typeName
              || headerClassName == pointTensorField::typeName
+
+             || headerClassName == volScalarField::Internal::typeName
+             || headerClassName == volVectorField::Internal::typeName
+             || headerClassName == volSphericalTensorField::Internal::typeName
+             || headerClassName == volSymmTensorField::Internal::typeName
+             || headerClassName == volTensorField::Internal::typeName
             )
             {
                 Info<< "        Reading " << headerClassName
                     << " : " << iter()->name() << endl;
 
-                fieldDictionary fDict
-                (
-                    *iter(),
-                    headerClassName
-                );
+                fieldDictionary fDict(*iter(), headerClassName);
 
                 Info<< "        Writing " << iter()->name() << endl;
                 fDict.regIOobject::write();
             }
         }
 
+
+
+        // Check for lagrangian
+        stringList lagrangianDirs
+        (
+            1,
+            fileHandler().filePath
+            (
+                runTime.timePath()
+              / regionPrefix
+              / cloud::prefix
+            )
+        );
+
+        combineReduce(lagrangianDirs, uniqueEqOp());
+
+        if (!lagrangianDirs.empty())
+        {
+            if (meshPtr.valid())
+            {
+                meshPtr().readUpdate();
+            }
+            else
+            {
+                Info<< "        Create polyMesh for time = "
+                    << runTime.timeName() << endl;
+
+                meshPtr.reset
+                (
+                    new polyMesh
+                    (
+                        IOobject
+                        (
+                            polyMesh::defaultRegion,
+                            runTime.timeName(),
+                            runTime,
+                            Foam::IOobject::MUST_READ
+                        )
+                    )
+                );
+            }
+
+            stringList cloudDirs
+            (
+                fileHandler().readDir
+                (
+                    lagrangianDirs[0],
+                    fileName::DIRECTORY
+                )
+            );
+
+            combineReduce(cloudDirs, uniqueEqOp());
+
+            forAll(cloudDirs, i)
+            {
+                fileName dir(cloud::prefix/cloudDirs[i]);
+
+                Cloud<passiveParticle> parcels(meshPtr(), cloudDirs[i], false);
+
+                parcels.writeObject
+                (
+                    runTime.writeFormat(),
+                    IOstream::currentVersion,
+                    runTime.writeCompression(),
+                    parcels.size()
+                );
+
+
+                // Do local scan for valid cloud objects
+                IOobjectList sprayObjs(runTime, runTime.timeName(), dir);
+
+                // Combine with all other cloud objects
+                stringList sprayFields(sprayObjs.sortedToc());
+                combineReduce(sprayFields, uniqueEqOp());
+
+                forAll(sprayFields, fieldi)
+                {
+                    const word& name = sprayFields[fieldi];
+
+                    // Note: try the various field types. Make sure to
+                    //       exit once sucessful conversion to avoid re-read
+                    //       converted file.
+
+                    if
+                    (
+                        name == "positions"
+                     || name == "origProcId"
+                     || name == "origId"
+                    )
+                    {
+                        continue;
+                    }
+
+                    bool writeOk = writeOptionalMeshObject<labelIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<scalarIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<vectorIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<sphericalTensorIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<symmTensorIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<tensorIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<labelFieldIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+                    if (writeOk) continue;
+
+                    writeOk = writeOptionalMeshObject<vectorFieldIOField>
+                    (
+                        name,
+                        dir,
+                        runTime,
+                        parcels.size() > 0
+                    );
+
+                    if (!writeOk)
+                    {
+                        Info<< "        Failed converting " << name << endl;
+                    }
+                }
+            }
+        }
+
         Info<< endl;
     }
 
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
index 2c0909436..32449bc7c 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
+++ b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.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-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class T>
+template<class Type, class CheckType = Type>
 inline bool writeMeshObject
 (
     const word& name,
@@ -61,7 +61,11 @@ inline bool writeMeshObject
 
     bool writeOk = false;
 
-    if (io.headerOk())
+    if
+    (
+        io.typeHeaderOk<Type>(false)
+     && io.headerClassName() == CheckType::typeName
+    )
     {
         Info<< "        Reading " << io.headerClassName()
             << " : " << name << endl;
@@ -71,15 +75,15 @@ inline bool writeMeshObject
         word oldTypeName;
         if (disableHeaderChecking)
         {
-            oldTypeName = T::typeName;
-            const_cast<word&>(T::typeName) = word::null;
+            oldTypeName = Type::typeName;
+            const_cast<word&>(Type::typeName) = word::null;
         }
 
-        T meshObject(io);
+        Type meshObject(io);
 
         if (disableHeaderChecking)
         {
-            const_cast<word&>(T::typeName) = oldTypeName;
+            const_cast<word&>(Type::typeName) = oldTypeName;
             // Fake type back to what was in field
             const_cast<word&>(meshObject.type()) = io.headerClassName();
         }
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
index fcde0657e..893f7f345 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,8 @@ void Foam::helpTypes::helpBoundary::execute
             IOobject::MUST_READ
         );
 
-        if (fieldHeader.headerOk())
+        // Check for any type of volField
+        if (fieldHeader.typeHeaderOk<volScalarField>(false))
         {
             if (args.optionFound("fixedValue"))
             {
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index e98e3c8f4..06d9684f7 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
                 IOobject::MUST_READ
             );
 
-            if (obj.headerOk())
+            if (obj.typeHeaderOk<volScalarField>(false))
             {
                 addToFieldList(vsf, obj, objI, mesh);
                 addToFieldList(vvf, obj, objI, mesh);
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index c5ba4132e..fd3c03aaf 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -104,6 +104,7 @@ Usage
 #include "pointFieldDecomposer.H"
 #include "lagrangianFieldDecomposer.H"
 #include "decompositionModel.H"
+#include "collatedFileOperation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -157,21 +158,25 @@ void decomposeUniform
     // Any uniform data to copy/link?
     const fileName uniformDir(regionDir/"uniform");
 
-    if (isDir(runTime.timePath()/uniformDir))
+    if (fileHandler().isDir(runTime.timePath()/uniformDir))
     {
         Info<< "Detected additional non-decomposed files in "
             << runTime.timePath()/uniformDir
             << endl;
 
-        const fileName timePath = processorDb.timePath();
+        const fileName timePath =
+            fileHandler().filePath(processorDb.timePath());
 
         if (copyUniform || mesh.distributed())
         {
-            cp
-            (
-                runTime.timePath()/uniformDir,
-                timePath/uniformDir
-            );
+            if (!fileHandler().exists(timePath/uniformDir))
+            {
+                fileHandler().cp
+                (
+                    runTime.timePath()/uniformDir,
+                    timePath/uniformDir
+                );
+            }
         }
         else
         {
@@ -185,11 +190,15 @@ void decomposeUniform
 
             fileName currentDir(cwd());
             chDir(timePath);
-            ln
-            (
-                parentPath/runTime.timeName()/uniformDir,
-                uniformDir
-            );
+
+            if (!fileHandler().exists(uniformDir))
+            {
+                fileHandler().ln
+                (
+                    parentPath/runTime.timeName()/uniformDir,
+                    uniformDir
+                );
+            }
             chDir(currentDir);
         }
     }
@@ -343,24 +352,10 @@ int main(int argc, char *argv[])
         Info<< "\n\nDecomposing mesh " << regionName << nl << endl;
 
 
-        // determine the existing processor count directly
-        label nProcs = 0;
-        while
-        (
-            isDir
-            (
-                runTime.path()
-              / (word("processor") + name(nProcs))
-              / runTime.constant()
-              / regionDir
-              / polyMesh::meshSubDir
-            )
-        )
-        {
-            ++nProcs;
-        }
+        // Determine the existing processor count directly
+        label nProcs = fileHandler().nProcs(runTime.path(), regionDir);
 
-        // get requested numberOfSubdomains. Note: have no mesh yet so
+        // Get requested numberOfSubdomains. Note: have no mesh yet so
         // cannot use decompositionModel::New
         const label nDomains = readLabel
         (
@@ -413,6 +408,8 @@ int main(int argc, char *argv[])
                 Info<< "Removing " << nProcs
                     << " existing processor directories" << endl;
 
+                fileHandler().rmDir(runTime.path()/word("processors"));
+
                 // remove existing processor dirs
                 // reverse order to avoid gaps if someone interrupts the process
                 for (label proci = nProcs-1; proci >= 0; --proci)
@@ -422,7 +419,7 @@ int main(int argc, char *argv[])
                         runTime.path()/(word("processor") + name(proci))
                     );
 
-                    rmDir(procDir);
+                    fileHandler().rmDir(procDir);
                 }
 
                 procDirsProblem = false;
@@ -459,6 +456,12 @@ int main(int argc, char *argv[])
         // Decompose the mesh
         if (!decomposeFieldsOnly)
         {
+            // Disable buffering when writing mesh since we need to read
+            // it later on when decomposing the fields
+            float bufSz =
+                fileOperations::collatedFileOperation::maxThreadFileBufferSize;
+            fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
             mesh.decomposeMesh(dictPath);
 
             mesh.writeDecomposition(decomposeSets);
@@ -514,12 +517,15 @@ int main(int argc, char *argv[])
                     << cellDist.name() << " for use in postprocessing."
                     << endl;
             }
+
+            fileOperations::collatedFileOperation::maxThreadFileBufferSize = bufSz;
         }
 
 
         if (copyZero)
         {
-            // Link the 0 directory into each of the processor directories
+            // Copy the 0 directory into each of the processor directories
+            fileName prevTimePath;
             for (label proci = 0; proci < mesh.nProcs(); proci++)
             {
                 Time processorDb
@@ -530,14 +536,32 @@ int main(int argc, char *argv[])
                 );
                 processorDb.setTime(runTime);
 
-                if (isDir(runTime.timePath()))
+                if (fileHandler().isDir(runTime.timePath()))
                 {
-                    const fileName timePath = processorDb.timePath();
+                    // Get corresponding directory name (to handle processors/)
+                    const fileName timePath
+                    (
+                        fileHandler().objectPath
+                        (
+                            IOobject
+                            (
+                                "",
+                                processorDb.timeName(),
+                                processorDb
+                            ),
+                            word::null
+                        )
+                    );
 
-                    Info<< "Processor " << proci
-                        << ": linking " << runTime.timePath() << nl
-                        << " to " << processorDb.timePath() << endl;
-                    cp(runTime.timePath(), processorDb.timePath());
+                    if (timePath != prevTimePath)
+                    {
+                        Info<< "Processor " << proci
+                            << ": copying " << runTime.timePath() << nl
+                            << " to " << timePath << endl;
+                        fileHandler().cp(runTime.timePath(), timePath);
+
+                        prevTimePath = timePath;
+                    }
                 }
             }
         }
@@ -638,9 +662,10 @@ int main(int argc, char *argv[])
 
                 fileNameList cloudDirs
                 (
-                    readDir
+                    fileHandler().readDir
                     (
-                        runTime.timePath()/cloud::prefix, fileName::DIRECTORY
+                        runTime.timePath()/cloud::prefix,
+                        fileName::DIRECTORY
                     )
                 );
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 9c1ad8c4d..670cd40db 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -315,9 +315,6 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             time().caseName()/fileName(word("processor") + Foam::name(proci))
         );
 
-        // make the processor directory
-        mkDir(time().rootPath()/processorCasePath);
-
         // create a database
         Time processorDb
         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
index 79754c1c0..3528dfd5d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,11 +188,12 @@ void Foam::lagrangianFieldDecomposer::decomposeFields
     const PtrList<GeoField>& fields
 ) const
 {
-    if (particleIndices_.size())
+    //if (particleIndices_.size())
     {
+        bool valid = particleIndices_.size() > 0;
         forAll(fields, fieldi)
         {
-            decomposeField(cloudName, fields[fieldi])().write();
+            decomposeField(cloudName, fields[fieldi])().write(valid);
         }
     }
 }
@@ -205,11 +206,12 @@ void Foam::lagrangianFieldDecomposer::decomposeFieldFields
     const PtrList<GeoField>& fields
 ) const
 {
-    if (particleIndices_.size())
+    //if (particleIndices_.size())
     {
+        bool valid = particleIndices_.size() > 0;
         forAll(fields, fieldi)
         {
-            decomposeFieldField(cloudName, fields[fieldi])().write();
+            decomposeFieldField(cloudName, fields[fieldi])().write(valid);
         }
     }
 }
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 68ed31dbe..bdcc5c2c2 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,12 +174,43 @@ int main(int argc, char *argv[])
     const bool allRegions = args.optionFound("allRegions");
 
 
-    // determine the processor count directly
-    label nProcs = 0;
-    while (isDir(args.path()/(word("processor") + name(nProcs))))
+    wordList regionNames;
+    wordList regionDirs;
+    if (allRegions)
     {
-        ++nProcs;
+        Info<< "Reconstructing for all regions in regionProperties" << nl
+            << endl;
+        regionProperties rp(runTime);
+        forAllConstIter(HashTable<wordList>, rp, iter)
+        {
+            const wordList& regions = iter();
+            forAll(regions, i)
+            {
+                if (findIndex(regionNames, regions[i]) == -1)
+                {
+                    regionNames.append(regions[i]);
+                }
+            }
+        }
+        regionDirs = regionNames;
     }
+    else
+    {
+        word regionName;
+        if (args.optionReadIfPresent("region", regionName))
+        {
+            regionNames = wordList(1, regionName);
+            regionDirs = regionNames;
+        }
+        else
+        {
+            regionNames = wordList(1, fvMesh::defaultRegion);
+            regionDirs = wordList(1, word::null);
+        }
+    }
+
+    // Determine the processor count
+    label nProcs = fileHandler().nProcs(args.path(), regionDirs[0]);
 
     if (!nProcs)
     {
@@ -222,9 +253,8 @@ int main(int argc, char *argv[])
 
     if (timeDirs.empty())
     {
-        FatalErrorInFunction
-            << "No times selected"
-            << exit(FatalError);
+        WarningInFunction << "No times selected";
+        exit(1);
     }
 
 
@@ -248,42 +278,6 @@ int main(int argc, char *argv[])
     }
 
 
-    wordList regionNames;
-    wordList regionDirs;
-    if (allRegions)
-    {
-        Info<< "Reconstructing for all regions in regionProperties" << nl
-            << endl;
-        regionProperties rp(runTime);
-        forAllConstIter(HashTable<wordList>, rp, iter)
-        {
-            const wordList& regions = iter();
-            forAll(regions, i)
-            {
-                if (findIndex(regionNames, regions[i]) == -1)
-                {
-                    regionNames.append(regions[i]);
-                }
-            }
-        }
-        regionDirs = regionNames;
-    }
-    else
-    {
-        word regionName;
-        if (args.optionReadIfPresent("region", regionName))
-        {
-            regionNames = wordList(1, regionName);
-            regionDirs = regionNames;
-        }
-        else
-        {
-            regionNames = wordList(1, fvMesh::defaultRegion);
-            regionDirs = wordList(1, word::null);
-        }
-    }
-
-
     forAll(regionNames, regioni)
     {
         const word& regionName = regionNames[regioni];
@@ -550,17 +544,26 @@ int main(int argc, char *argv[])
 
                 forAll(databases, proci)
                 {
-                    fileNameList cloudDirs
+                    fileName lagrangianDir
                     (
-                        readDir
+                        fileHandler().filePath
                         (
                             databases[proci].timePath()
                           / regionDir
-                          / cloud::prefix,
-                            fileName::DIRECTORY
+                          / cloud::prefix
                         )
                     );
 
+                    fileNameList cloudDirs;
+                    if (!lagrangianDir.empty())
+                    {
+                        cloudDirs = fileHandler().readDir
+                        (
+                            lagrangianDir,
+                            fileName::DIRECTORY
+                        );
+                    }
+
                     forAll(cloudDirs, i)
                     {
                         // Check if we already have cloud objects for this
@@ -995,12 +998,15 @@ int main(int argc, char *argv[])
             {
                 fileName uniformDir0
                 (
-                    databases[0].timePath()/regionDir/"uniform"
+                    fileHandler().filePath
+                    (
+                        databases[0].timePath()/regionDir/"uniform"
+                    )
                 );
 
-                if (isDir(uniformDir0))
+                if (!uniformDir0.empty() && fileHandler().isDir(uniformDir0))
                 {
-                    cp(uniformDir0, runTime.timePath()/regionDir);
+                    fileHandler().cp(uniformDir0, runTime.timePath()/regionDir);
                 }
             }
 
@@ -1010,12 +1016,15 @@ int main(int argc, char *argv[])
             {
                 fileName uniformDir0
                 (
-                    databases[0].timePath()/"uniform"
+                    fileHandler().filePath
+                    (
+                        databases[0].timePath()/"uniform"
+                    )
                 );
 
-                if (isDir(uniformDir0))
+                if (!uniformDir0.empty() && fileHandler().isDir(uniformDir0))
                 {
-                    cp(uniformDir0, runTime.timePath());
+                    fileHandler().cp(uniformDir0, runTime.timePath());
                 }
             }
         }
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index b0206a0c0..a5bd8637b 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -548,20 +548,7 @@ int main(int argc, char *argv[])
     bool writeCellDist = args.optionFound("cellDist");
 
 
-    int nProcs = 0;
-
-    while
-    (
-        isDir
-        (
-            args.rootPath()
-          / args.caseName()
-          / fileName(word("processor") + name(nProcs))
-        )
-    )
-    {
-        nProcs++;
-    }
+    label nProcs = fileHandler().nProcs(args.path());
 
     Info<< "Found " << nProcs << " processor directories" << nl << endl;
 
@@ -609,13 +596,21 @@ int main(int argc, char *argv[])
             databases[proci].setTime(timeDirs[timeI], timeI);
         }
 
-        const fileName meshPath =
-            databases[0].path()
-           /databases[0].timeName()
-           /regionDir
-           /polyMesh::meshSubDir;
+        IOobject facesIO
+        (
+            "faces",
+            databases[0].timeName(),
+            regionDir/polyMesh::meshSubDir,
+            databases[0],
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        );
 
-        if (!isFile(meshPath/"faces"))
+
+        // Problem: faceCompactIOList recognises both 'faceList' and
+        //          'faceCompactList' so we should be lenient when doing
+        //          typeHeaderOk
+        if (!facesIO.typeHeaderOk<faceCompactIOList>(false))
         {
             Info<< "No mesh." << nl << endl;
             continue;
diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
index 1bad1c799..275384220 100644
--- a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
@@ -115,7 +115,10 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
 
 
     // Check who has a mesh
-    const bool haveMesh = isDir(io.time().path()/io.instance()/meshSubDir);
+    const bool haveMesh = fileHandler().isDir
+    (
+        fileHandler().filePath(io.time().path()/io.instance()/meshSubDir)
+    );
 
     if (!haveMesh)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
index 76b55aada..47a3540da 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
@@ -16,6 +16,6 @@ for (label n1=0; n1<Times.size() && variableGood; ++n1)
             Times[n1].name(),
             mesh,
             IOobject::NO_READ
-        ).headerOk();
+        ).typeHeaderOk<volScalarField>(false);
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
index 8657a9cc2..d4027ad1c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
@@ -17,7 +17,7 @@ if (Times.size() > 1)
                 mesh,
                 IOobject::NO_READ
             );
-            if (io.headerOk())
+            if (io.typeHeaderOk<pointIOField>(true))
             {
                 meshMoving = true;
                 break;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 3063f9ddb..566fdd7fb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -584,7 +584,10 @@ int main(int argc, char *argv[])
                     IOobject::MUST_READ
                 );
 
-                bool fieldExists = fieldObject.headerOk();
+                bool fieldExists = fieldObject.typeHeaderOk<IOField<scalar>>
+                (
+                    false
+                );
                 if (fieldType == scalarIOField::typeName)
                 {
                     ensightCloudField<scalar>
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
index a5a2dd7d2..454cb3ebb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
@@ -13,6 +13,6 @@ if (timeDirs.size() > 1)
             polyMesh::meshSubDir,
             mesh,
             IOobject::NO_READ
-        ).headerOk();
+        ).typeHeaderOk<pointIOField>(true);
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
index 30a7c81e4..b1f186b09 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
@@ -24,7 +24,7 @@
             false
         );
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<IOdictionary>(true))
         {
             io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
             IOdictionary timeObject(io);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
index 284a0df35..f894e2c13 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
@@ -7,7 +7,7 @@
         mesh
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<pointIOField>(true))
     {
         // Read new points
         io.readOpt() = IOobject::MUST_READ;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 4c65e583e..03a76e585 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -71,7 +71,13 @@ for (label i=0; i < nTypes; i++)
             IOobject::NO_READ
         );
 
-        if (lagrangianHeader.headerOk())
+        if
+        (
+            lagrangianHeader.typeHeaderOk<IOPosition<Cloud<passiveParticle>>>
+            (
+                false
+            )
+        )
         {
             Cloud<passiveParticle> particles(mesh, cloud::defaultName);
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
index e84837fd1..c1a1f8dee 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
@@ -6,7 +6,7 @@ IOobject ioPoints
     mesh
 );
 
-if (ioPoints.headerOk())
+if (ioPoints.typeHeaderOk<pointIOField>(true))
 {
     Info<< "new points available" << endl;
     // Reading new points
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 2e5151113..3f89b9338 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,7 @@ License
 #include "fvMesh.H"
 #include "Time.H"
 #include "patchZones.H"
+#include "collatedFileOperation.H"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -249,6 +250,12 @@ Foam::vtkPV3Foam::vtkPV3Foam
         printMemory();
     }
 
+    // Make sure not to use the threaded version - it does not like
+    // being loaded as a shared library - static cleanup order is problematic.
+    // For now just disable the threaded writer.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
+
     // avoid argList and get rootPath/caseName directly from the file
     fileName fullCasePath(fileName(FileName).path());
 
@@ -567,7 +574,13 @@ double* Foam::vtkPV3Foam::findTimes(int& nTimeSteps)
             if
             (
                 isFile(runTime.path()/timeName/meshDir_/"points")
-             && IOobject("points", timeName, meshDir_, runTime).headerOk()
+             && IOobject
+                (
+                    "points",
+                    timeName,
+                    meshDir_,
+                    runTime
+                ).typeHeaderOk<pointIOField>(true)
             )
             {
                 break;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index 1386bc848..7a9d3cb98 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ public:
         explicit zonesEntries(const IOobject& io)
         :
             regIOobject(io),
-            PtrList<entry>(readStream("regIOobject"))
+            PtrList<entry>(readStream(word("regIOobject")))
         {
             close();
         }
@@ -124,7 +124,7 @@ Foam::wordList Foam::vtkPV3Foam::getZoneNames(const word& zoneType) const
         false
     );
 
-    if (ioObj.headerOk())
+    if (ioObj.typeHeaderOk<cellZoneMesh>(false))
     {
         zonesEntries zones(ioObj);
 
@@ -333,7 +333,7 @@ void Foam::vtkPV3Foam::updateInfoPatches
         );
 
         // this should only ever fail if the mesh region doesn't exist
-        if (ioObj.headerOk())
+        if (ioObj.typeHeaderOk<polyBoundaryMesh>(true))
         {
             polyBoundaryMeshEntries patchEntries(ioObj);
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
index 3aea81a88..4496fc3a1 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ License
 #include "Time.H"
 #include "patchZones.H"
 #include "OStringStream.H"
+#include "collatedFileOperation.H"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -164,6 +165,12 @@ Foam::vtkPV3blockMesh::vtkPV3blockMesh
             << FileName << endl;
     }
 
+    // Make sure not to use the threaded version - it does not like
+    // being loaded as a shared library - static cleanup order is problematic.
+    // For now just disable the threaded writer.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
+
     // avoid argList and get rootPath/caseName directly from the file
     fileName fullCasePath(fileName(FileName).path());
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index ccf641792..ba4436bbc 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,7 @@ License
 #include "fvMesh.H"
 #include "Time.H"
 #include "patchZones.H"
+#include "collatedFileOperation.H"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -249,6 +250,12 @@ Foam::vtkPVFoam::vtkPVFoam
         printMemory();
     }
 
+    // Make sure not to use the threaded version - it does not like
+    // being loaded as a shared library - static cleanup order is problematic.
+    // For now just disable the threaded writer.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
+
     // avoid argList and get rootPath/caseName directly from the file
     fileName fullCasePath(fileName(FileName).path());
 
@@ -566,8 +573,13 @@ double* Foam::vtkPVFoam::findTimes(int& nTimeSteps)
 
             if
             (
-                isFile(runTime.path()/timeName/meshDir_/"points")
-             && IOobject("points", timeName, meshDir_, runTime).headerOk()
+                IOobject
+                (
+                    "points",
+                    timeName,
+                    meshDir_,
+                    runTime
+                ).typeHeaderOk<pointIOField>(true)
             )
             {
                 break;
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 5ff623b34..502edc256 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ public:
         explicit zonesEntries(const IOobject& io)
         :
             regIOobject(io),
-            PtrList<entry>(readStream("regIOobject"))
+            PtrList<entry>(readStream(word("regIOobject")))
         {
             close();
         }
@@ -124,7 +124,7 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
         false
     );
 
-    if (ioObj.headerOk())
+    if (ioObj.typeHeaderOk<cellZoneMesh>(false))
     {
         zonesEntries zones(ioObj);
 
@@ -333,7 +333,7 @@ void Foam::vtkPVFoam::updateInfoPatches
         );
 
         // this should only ever fail if the mesh region doesn't exist
-        if (ioObj.headerOk())
+        if (ioObj.typeHeaderOk<polyBoundaryMesh>(true))
         {
             polyBoundaryMeshEntries patchEntries(ioObj);
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index dd40c8e35..a9cc175c2 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ License
 #include "Time.H"
 #include "patchZones.H"
 #include "OStringStream.H"
+#include "collatedFileOperation.H"
 
 // VTK includes
 #include "vtkDataArraySelection.h"
@@ -170,6 +171,12 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
             << FileName << endl;
     }
 
+    // Make sure not to use the threaded version - it does not like
+    // being loaded as a shared library - static cleanup order is problematic.
+    // For now just disable the threaded writer.
+    fileOperations::collatedFileOperation::maxThreadFileBufferSize = 0;
+
+
     // avoid argList and get rootPath/caseName directly from the file
     fileName fullCasePath(fileName(FileName).path());
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index 6167798a3..ea12f0aef 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -28,7 +28,7 @@ int USERD_set_filenames
         // remove the last '/' from rootDir
         if (the_path[lRoot-1] == '/')
         {
-            the_path[lRoot-1] = char(NULL);
+            the_path[lRoot-1] = '\0';
         }
         else
         {
@@ -171,7 +171,7 @@ int USERD_set_filenames
         false
     );
 
-    if (sprayHeader.headerOk())
+    if (sprayHeader.typeHeaderOk<Cloud<passiveParticle>>(false))
     {
         Info<< "[Found lagrangian]" << endl;
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldScalar.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldScalar.H
index eaa8e78a8..a66e4c53c 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldScalar.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldScalar.H
@@ -12,7 +12,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volScalarField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H
index c2c729ba2..a7b72c65b 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H
@@ -12,7 +12,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volTensorField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldVector.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldVector.H
index 5ae68d2a5..90f9fd471 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldVector.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldVector.H
@@ -12,7 +12,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volVectorField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldScalar.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldScalar.H
index 46f4f46d8..549a80f64 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldScalar.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldScalar.H
@@ -13,7 +13,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volScalarField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H
index 9321619b3..0aed2ac26 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H
@@ -13,7 +13,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volTensorField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldVector.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldVector.H
index fa8441bb5..4c6fe3832 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldVector.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldVector.H
@@ -13,7 +13,7 @@ IOobject fieldObjectPtr
     IOobject::NO_READ
 );
 
-if (!fieldObjectPtr.headerOk())
+if (!fieldObjectPtr.typeHeaderOk<volVectorField>(true))
 {
     return Z_UNDEF;
 }
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H b/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
index e0ce9b1f6..83a7c1204 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
@@ -6,7 +6,7 @@
         IOobject::MUST_READ
     );
 
-    if (!UMeanHeader.headerOk())
+    if (!UMeanHeader.typeHeaderOk<volVectorField>(true))
     {
         Info<< "    No UMean field" << endl;
         continue;
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index c63da510d..78924a984 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -82,6 +82,7 @@ See also
 #include "argList.H"
 #include "Time.H"
 #include "CSV.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index d8922828b..026feb77d 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
             false
         );
 
-        if (omegaHeader.headerOk())
+        if (omegaHeader.typeHeaderOk<volScalarField>(true))
         {
             volScalarField omega(omegaHeader, mesh);
             dimensionedScalar k0("VSMALL", k.dimensions(), VSMALL);
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
             false
         );
 
-        if (nuTildaHeader.headerOk())
+        if (nuTildaHeader.typeHeaderOk<volScalarField>(true))
         {
             volScalarField nuTilda(nuTildaHeader, mesh);
             nuTilda = nut;
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 355d2e1c7..120be89f7 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -428,7 +428,6 @@ int main(int argc, char *argv[])
         FatalErrorInFunction
             << "No times selected." << exit(FatalError);
     }
-
     forAll(times, timei)
     {
         word instance;
@@ -641,7 +640,8 @@ int main(int argc, char *argv[])
                 (
                     runTime.writeFormat(),
                     runTime.writeFormat(),
-                    IOstream::UNCOMPRESSED
+                    IOstream::UNCOMPRESSED,
+                    true
                 );
             }
             else
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index de17c4520..ef4b53a73 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,8 @@ void rewriteBoundary
     HashTable<word>& nbrNames
 )
 {
-    Info<< "Reading boundary from " << io.filePath() << endl;
+    Info<< "Reading boundary from " << typeFilePath<IOPtrList<entry>>(io)
+        << endl;
 
     // Read PtrList of dictionary.
     const word oldTypeName = IOPtrList<entry>::typeName;
@@ -446,7 +447,7 @@ int main(int argc, char *argv[])
         false
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<IOPtrList<entry>>(false))
     {
         rewriteBoundary
         (
@@ -480,7 +481,7 @@ int main(int argc, char *argv[])
             false
         );
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<IOPtrList<entry>>(false))
         {
             rewriteBoundary
             (
diff --git a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
index 672573e8c..5ec7fd184 100644
--- a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,12 @@ void MapConsistentVolFields
     const CombineOp& cop
 )
 {
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
     const fvMesh& meshSource = meshToMesh0Interp.fromMesh();
     const fvMesh& meshTarget = meshToMesh0Interp.toMesh();
 
-    word fieldClassName
-    (
-        GeometricField<Type, fvPatchField, volMesh>::typeName
-    );
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
+    IOobjectList fields = objects.lookupClass(fieldType::typeName);
 
     forAllIter(IOobjectList, fields, fieldIter)
     {
@@ -60,11 +57,7 @@ void MapConsistentVolFields
             << endl;
 
         // Read field
-        GeometricField<Type, fvPatchField, volMesh> fieldSource
-        (
-            *fieldIter(),
-            meshSource
-        );
+        fieldType fieldSource(*fieldIter(), meshSource);
 
         IOobject fieldTargetIOobject
         (
@@ -75,10 +68,10 @@ void MapConsistentVolFields
             IOobject::AUTO_WRITE
         );
 
-        if (fieldTargetIOobject.headerOk())
+        if (fieldTargetIOobject.typeHeaderOk<fieldType>(true))
         {
             // Read fieldTarget
-            GeometricField<Type, fvPatchField, volMesh> fieldTarget
+            fieldType fieldTarget
             (
                 fieldTargetIOobject,
                 meshTarget
@@ -101,7 +94,7 @@ void MapConsistentVolFields
             fieldTargetIOobject.readOpt() = IOobject::NO_READ;
 
             // Interpolate field
-            GeometricField<Type, fvPatchField, volMesh> fieldTarget
+            fieldType fieldTarget
             (
                 fieldTargetIOobject,
                 meshToMesh0Interp.interpolate
diff --git a/applications/utilities/preProcessing/mapFields/MapVolFields.H b/applications/utilities/preProcessing/mapFields/MapVolFields.H
index c72e70962..97aff73ff 100644
--- a/applications/utilities/preProcessing/mapFields/MapVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,12 @@ void MapVolFields
     const CombineOp& cop
 )
 {
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
     const fvMesh& meshSource = meshToMesh0Interp.fromMesh();
     const fvMesh& meshTarget = meshToMesh0Interp.toMesh();
 
-    word fieldClassName
-    (
-        GeometricField<Type, fvPatchField, volMesh>::typeName
-    );
-
-    IOobjectList fields = objects.lookupClass(fieldClassName);
+    IOobjectList fields = objects.lookupClass(fieldType::typeName);
 
     forAllIter(IOobjectList, fields, fieldIter)
     {
@@ -65,20 +62,15 @@ void MapVolFields
             IOobject::AUTO_WRITE
         );
 
-        if (fieldTargetIOobject.headerOk())
+        if (fieldTargetIOobject.typeHeaderOk<fieldType>(true))
         {
-            Info<< "    interpolating " << fieldIter()->name()
-                << endl;
+            Info<< "    interpolating " << fieldIter()->name() << endl;
 
             // Read field fieldSource
-            GeometricField<Type, fvPatchField, volMesh> fieldSource
-            (
-                *fieldIter(),
-                meshSource
-            );
+            fieldType fieldSource(*fieldIter(), meshSource);
 
             // Read fieldTarget
-            GeometricField<Type, fvPatchField, volMesh> fieldTarget
+            fieldType fieldTarget
             (
                 fieldTargetIOobject,
                 meshTarget
diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H
index 7fdc9424b..1624ed87c 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H
@@ -149,7 +149,7 @@ void MapVolFields
                 IOobject::MUST_READ
             );
 
-            if (targetIO.headerOk())
+            if (targetIO.typeHeaderOk<fieldType>(true))
             {
                 Info<< "    interpolating onto existing field "
                     << fieldName << endl;
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 129fd895f..35af64b74 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ bool setCellFieldType
     );
 
     // Check the "constant" directory
-    if (!fieldHeader.headerOk())
+    if (!fieldHeader.typeHeaderOk<fieldType>(true))
     {
         fieldHeader = IOobject
         (
@@ -76,7 +76,7 @@ bool setCellFieldType
     }
 
     // Check field exists
-    if (fieldHeader.headerOk())
+    if (fieldHeader.typeHeaderOk<fieldType>(true))
     {
         Info<< "    Setting internal values of "
             << fieldHeader.headerClassName()
@@ -210,7 +210,7 @@ bool setFaceFieldType
     );
 
     // Check the "constant" directory
-    if (!fieldHeader.headerOk())
+    if (!fieldHeader.typeHeaderOk<fieldType>(true))
     {
         fieldHeader = IOobject
         (
@@ -222,7 +222,7 @@ bool setFaceFieldType
     }
 
     // Check field exists
-    if (fieldHeader.headerOk())
+    if (fieldHeader.typeHeaderOk<fieldType>(true))
     {
         Info<< "    Setting patchField values of "
             << fieldHeader.headerClassName()
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 9336b30d1..7395cf970 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,6 +56,7 @@ Description
 #include "point.H"
 #include "triadField.H"
 #include "transform.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 099b15e5d..11e595a15 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,7 @@ Usage
 #include "PackedBoolList.H"
 #include "unitConversion.H"
 #include "searchableSurfaces.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 07e7d2390..d42837caf 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -195,7 +195,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (!csDictIoPtr->headerOk())
+        if (!csDictIoPtr->typeHeaderOk<coordinateSystems>(false))
         {
             FatalErrorInFunction
                 << "Cannot open coordinateSystems file\n    "
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index e989500d8..ec6f05d84 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -315,7 +315,9 @@ int main(int argc, char *argv[])
 
 
             Info<< "writing surfMesh as obj = oldSurfIn.obj" << endl;
-            surfIn.write("oldSurfIn.obj");
+
+            using Foam::surfMesh;
+            surfIn.write(fileName("oldSurfIn.obj"));
 
 
             Info<< "runTime.instance() = " << runTime.instance() << endl;
@@ -368,7 +370,7 @@ int main(int argc, char *argv[])
             surfOut.write();
 
             // write directly
-            surfOut.write("someName.ofs");
+            surfOut.surfMesh::write(fileName("someName.ofs"));
 
 #if 1
             const surfZoneList& zones = surfOut.surfZones();
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index ad65216e7..e4632f3c3 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (!ioPtr->headerOk())
+        if (!ioPtr->typeHeaderOk<coordinateSystems>(false))
         {
             FatalErrorInFunction
                 << ioPtr->objectPath() << nl
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 7a1a0f53a..74a3eb197 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (!ioPtr->headerOk())
+        if (!ioPtr->typeHeaderOk<coordinateSystems>(false))
         {
             FatalErrorInFunction
                 << ioPtr->objectPath() << nl
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 6c93df68c..d24e71441 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -362,6 +362,7 @@ int main(int argc, char *argv[])
           ? runTime.path()/".."/outFileName
           : runTime.path()/outFileName
         );
+        globalCasePath.clean();
 
         Info<< "Writing merged surface to " << globalCasePath << endl;
 
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 81793bc42..e960fe0f4 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -31,21 +31,18 @@ Description
 
 Note
     - best decomposition option is hierarchGeomDecomp since
-    guarantees square decompositions.
+      guarantees square decompositions.
     - triangles might be present on multiple processors.
     - merging uses geometric tolerance so take care with writing precision.
 
 \*---------------------------------------------------------------------------*/
 
-#include "treeBoundBox.H"
-#include "FixedList.H"
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "distributedTriSurfaceMesh.H"
 #include "mapDistribute.H"
-#include "triSurfaceFields.H"
-#include "Pair.H"
+#include "localIOdictionary.H"
 
 using namespace Foam;
 
@@ -172,10 +169,11 @@ int main(int argc, char *argv[])
         "triSurface",         // local
         runTime,              // registry
         IOobject::MUST_READ,
-        IOobject::NO_WRITE
+        IOobject::AUTO_WRITE
     );
 
-    const fileName actualPath(io.filePath());
+    // Look for file (using searchableSurface rules)
+    const fileName actualPath(typeFilePath<searchableSurface>(io));
     fileName localPath(actualPath);
     localPath.replace(runTime.rootPath() + '/', "");
 
@@ -197,7 +195,7 @@ int main(int argc, char *argv[])
         dict.add("distributionType", distType);
         dict.add("mergeDistance", SMALL);
 
-        IOdictionary ioDict
+        localIOdictionary ioDict
         (
             IOobject
             (
@@ -215,11 +213,13 @@ int main(int argc, char *argv[])
         Info<< "Writing dummy bounds dictionary to " << ioDict.name()
             << nl << endl;
 
+        // Force writing in ascii
         ioDict.regIOobject::writeObject
         (
             IOstream::ASCII,
             IOstream::currentVersion,
-            ioDict.time().writeCompression()
+            ioDict.time().writeCompression(),
+            true
         );
     }
 
@@ -239,23 +239,17 @@ int main(int argc, char *argv[])
             (
                 IOobject
                 (
-                    surfMesh.searchableSurface::name(),     // name
-                    surfMesh.searchableSurface::instance(), // instance
-                    surfMesh.searchableSurface::local(),    // local
+                    "faceCentres",                                  // name
+                    surfMesh.searchableSurface::time().timeName(),  // instance
                     surfMesh,
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
                 surfMesh,
-                dimLength
+                dimLength,
+                s.faceCentres()
             )
         );
-        triSurfaceVectorField& fc = fcPtr();
-
-        forAll(fc, triI)
-        {
-            fc[triI] = s[triI].centre(s.points());
-        }
 
         // Steal pointer and store object on surfMesh
         fcPtr.ptr()->store();
@@ -290,7 +284,7 @@ int main(int argc, char *argv[])
 
 
     Info<< "Writing surface." << nl << endl;
-    surfMesh.searchableSurface::write();
+    surfMesh.objectRegistry::write();
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 62313f789..adbc92713 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -43,6 +43,7 @@ Description
 #include "absoluteEnthalpy.H"
 
 #include "SLPtrList.H"
+#include "IOdictionary.H"
 
 using namespace Foam;
 
diff --git a/etc/controlDict b/etc/controlDict
index 60a10a874..fd1f583ca 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -55,6 +55,20 @@ OptimisationSwitches
     //  - inotifyMaster     : do inotify (and file reading) only on master.
     fileModificationChecking timeStampMaster;
 
+    //- Parallel IO file handler
+    //  uncollated (default), collated or masterUncollated
+    fileHandler uncollated;
+
+    //- collated: thread buffer size for queued file writes.
+    //  If set to 0 or not sufficient for the file size threading is not used.
+    //  Default: 2e9
+    maxThreadFileBufferSize 2e9;
+
+    //- masterUncollated: non-blocking buffer size.
+    //  If the file exceeds this buffer size scheduled transfer is used.
+    //  Default: 2e9
+    maxMasterFileBufferSize 2e9;
+
     commsType       nonBlocking; //scheduled; //blocking;
     floatTransfer   0;
     nProcsSimpleSum 0;
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 52305ec98..deaa19ddf 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,8 @@ Description
 #include "timer.H"
 #include "IFstream.H"
 #include "DynamicList.H"
+#include "IOstreams.H"
+#include "Pstream.H"
 
 #include <fstream>
 #include <cstdlib>
@@ -294,6 +296,16 @@ bool Foam::chDir(const fileName& dir)
 
 bool Foam::mkDir(const fileName& pathName, mode_t mode)
 {
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : pathName:" << pathName << " mode:" << mode
+            << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+
     // empty names are meaningless
     if (pathName.empty())
     {
@@ -440,13 +452,25 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
 bool Foam::chMod(const fileName& name, const mode_t m)
 {
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
     return ::chmod(name.c_str(), m) == 0;
 }
 
 
-mode_t Foam::mode(const fileName& name)
+mode_t Foam::mode(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+    }
+    fileStat fileStatus(name, followLink);
     if (fileStatus.isValid())
     {
         return fileStatus.status().st_mode;
@@ -458,14 +482,26 @@ mode_t Foam::mode(const fileName& name)
 }
 
 
-Foam::fileName::Type Foam::type(const fileName& name)
+Foam::fileName::Type Foam::type(const fileName& name, const bool followLink)
 {
-    mode_t m = mode(name);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    mode_t m = mode(name, followLink);
 
     if (S_ISREG(m))
     {
         return fileName::FILE;
     }
+    else if (S_ISLNK(m))
+    {
+        return fileName::LINK;
+    }
     else if (S_ISDIR(m))
     {
         return fileName::DIRECTORY;
@@ -477,27 +513,73 @@ Foam::fileName::Type Foam::type(const fileName& name)
 }
 
 
-bool Foam::exists(const fileName& name, const bool checkGzip)
+bool Foam::exists
+(
+    const fileName& name,
+    const bool checkGzip,
+    const bool followLink
+)
 {
-    return mode(name) || isFile(name, checkGzip);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << " checkGzip:" << checkGzip
+            << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    return mode(name, followLink) || isFile(name, checkGzip, followLink);
 }
 
 
-bool Foam::isDir(const fileName& name)
+bool Foam::isDir(const fileName& name, const bool followLink)
 {
-    return S_ISDIR(mode(name));
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    return S_ISDIR(mode(name, followLink));
 }
 
 
-bool Foam::isFile(const fileName& name, const bool checkGzip)
+bool Foam::isFile
+(
+    const fileName& name,
+    const bool checkGzip,
+    const bool followLink
+)
 {
-    return S_ISREG(mode(name)) || (checkGzip && S_ISREG(mode(name + ".gz")));
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << " checkGzip:" << checkGzip
+            << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    return
+        S_ISREG(mode(name, followLink))
+     || (checkGzip && S_ISREG(mode(name + ".gz", followLink)));
 }
 
 
-off_t Foam::fileSize(const fileName& name)
+off_t Foam::fileSize(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    fileStat fileStatus(name, followLink);
     if (fileStatus.isValid())
     {
         return fileStatus.status().st_size;
@@ -509,9 +591,17 @@ off_t Foam::fileSize(const fileName& name)
 }
 
 
-time_t Foam::lastModified(const fileName& name)
+time_t Foam::lastModified(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    fileStat fileStatus(name, followLink);
     if (fileStatus.isValid())
     {
         return fileStatus.status().st_mtime;
@@ -523,9 +613,17 @@ time_t Foam::lastModified(const fileName& name)
 }
 
 
-double Foam::highResLastModified(const fileName& name)
+double Foam::highResLastModified(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name);
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : name:" << name << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
+    fileStat fileStatus(name, followLink);
     if (fileStatus.isValid())
     {
         return
@@ -543,7 +641,8 @@ Foam::fileNameList Foam::readDir
 (
     const fileName& directory,
     const fileName::Type type,
-    const bool filtergz
+    const bool filtergz,
+    const bool followLink
 )
 {
     // Initial filename list size
@@ -552,8 +651,12 @@ Foam::fileNameList Foam::readDir
 
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "reading directory " << directory << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME << " : reading directory " << directory << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     // Setup empty string list MAXTVALUES long
@@ -603,7 +706,7 @@ Foam::fileNameList Foam::readDir
                     )
                 )
                 {
-                    if ((directory/fName).type() == type)
+                    if ((directory/fName).type(followLink) == type)
                     {
                         if (nEntries >= dirEntries.size())
                         {
@@ -633,18 +736,28 @@ Foam::fileNameList Foam::readDir
 }
 
 
-bool Foam::cp(const fileName& src, const fileName& dest)
+bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
 {
+    if (POSIX::debug)
+    {
+        Pout<< FUNCTION_NAME << " : src:" << src << " dest:" << dest << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
+    }
     // Make sure source exists.
     if (!exists(src))
     {
         return false;
     }
 
+    const fileName::Type srcType = src.type(followLink);
+
     fileName destFile(dest);
 
     // Check type of source file.
-    if (src.type() == fileName::FILE)
+    if (srcType == fileName::FILE)
     {
         // If dest is a directory, create the destination file name.
         if (destFile.type() == fileName::DIRECTORY)
@@ -684,7 +797,23 @@ bool Foam::cp(const fileName& src, const fileName& dest)
             return false;
         }
     }
-    else if (src.type() == fileName::DIRECTORY)
+    else if (srcType == fileName::LINK)
+    {
+        // If dest is a directory, create the destination file name.
+        if (destFile.type() == fileName::DIRECTORY)
+        {
+            destFile = destFile/src.name();
+        }
+
+        // Make sure the destination directory exists.
+        if (!isDir(destFile.path()) && !mkDir(destFile.path()))
+        {
+            return false;
+        }
+
+        ln(src, destFile);
+    }
+    else if (srcType == fileName::DIRECTORY)
     {
         // If dest is a directory, create the destination file name.
         if (destFile.type() == fileName::DIRECTORY)
@@ -699,7 +828,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
         }
 
         // Copy files
-        fileNameList contents = readDir(src, fileName::FILE, false);
+        fileNameList contents = readDir(src, fileName::FILE, false, followLink);
         forAll(contents, i)
         {
             if (POSIX::debug)
@@ -710,11 +839,18 @@ bool Foam::cp(const fileName& src, const fileName& dest)
             }
 
             // File to file.
-            cp(src/contents[i], destFile/contents[i]);
+            cp(src/contents[i], destFile/contents[i], followLink);
         }
 
         // Copy sub directories.
-        fileNameList subdirs = readDir(src, fileName::DIRECTORY);
+        fileNameList subdirs = readDir
+        (
+            src,
+            fileName::DIRECTORY,
+            false,
+            followLink
+        );
+
         forAll(subdirs, i)
         {
             if (POSIX::debug)
@@ -725,7 +861,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
             }
 
             // Dir to Dir.
-            cp(src/subdirs[i], destFile);
+            cp(src/subdirs[i], destFile, followLink);
         }
     }
 
@@ -737,9 +873,13 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 {
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "Create softlink from : " << src << " to " << dst
-            << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME
+            << " : Create softlink from : " << src << " to " << dst << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     if (exists(dst))
@@ -770,18 +910,22 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 }
 
 
-bool Foam::mv(const fileName& src, const fileName& dst)
+bool Foam::mv(const fileName& src, const fileName& dst, const bool followLink)
 {
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "Move : " << src << " to " << dst << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME << " : Move : " << src << " to " << dst << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     if
     (
         dst.type() == fileName::DIRECTORY
-     && src.type() != fileName::DIRECTORY
+     && src.type(followLink) != fileName::DIRECTORY
     )
     {
         const fileName dstName(dst/src.name());
@@ -799,8 +943,13 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
 {
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "mvBak : " << src << " to extension " << ext << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME
+            << " : moving : " << src << " to extension " << ext << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     if (exists(src, false))
@@ -836,8 +985,12 @@ bool Foam::rm(const fileName& file)
 {
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "Removing : " << file << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME << " : Removing : " << file << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     // Try returning plain file name; if not there, try with .gz
@@ -856,8 +1009,12 @@ bool Foam::rmDir(const fileName& directory)
 {
     if (POSIX::debug)
     {
-        InfoInFunction
-            << "removing directory " << directory << endl;
+        //InfoInFunction
+        Pout<< FUNCTION_NAME << " : removing directory " << directory << endl;
+        if ((POSIX::debug & 2) && !Pstream::master())
+        {
+            error::printStack(Pout);
+        }
     }
 
     // Pointers to the directory entries
@@ -883,7 +1040,7 @@ bool Foam::rmDir(const fileName& directory)
             {
                 fileName path = directory/fName;
 
-                if (path.type() == fileName::DIRECTORY)
+                if (path.type(false) == fileName::DIRECTORY)
                 {
                     if (!rmDir(path))
                     {
@@ -1192,4 +1349,143 @@ Foam::scalar Foam::osRandomDouble()
 }
 
 
+static Foam::DynamicList<Foam::autoPtr<pthread_t>> threads_;
+static Foam::DynamicList<Foam::autoPtr<pthread_mutex_t>> mutexes_;
+
+
+Foam::label Foam::allocateThread()
+{
+    forAll(threads_, i)
+    {
+        if (!threads_[i].valid())
+        {
+            if (POSIX::debug)
+            {
+                Pout<< "allocateThread : reusing index:" << i << endl;
+            }
+            // Reuse entry
+            threads_[i].reset(new pthread_t());
+            return i;
+        }
+    }
+
+    label index = threads_.size();
+    if (POSIX::debug)
+    {
+        Pout<< "allocateThread : new index:" << index << endl;
+    }
+    threads_.append(autoPtr<pthread_t>(new pthread_t()));
+
+    return index;
+}
+
+
+void Foam::createThread
+(
+    const label index,
+    void *(*start_routine) (void *),
+    void *arg
+)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "createThread : index:" << index << endl;
+    }
+    if (pthread_create(&threads_[index](), nullptr, start_routine, arg))
+    {
+        FatalErrorInFunction
+            << "Failed starting thread " << index << exit(FatalError);
+    }
+}
+
+
+void Foam::joinThread(const label index)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "freeThread : join:" << index << endl;
+    }
+    if (pthread_join(threads_[index](), nullptr))
+    {
+        FatalErrorInFunction << "Failed freeing thread " << index
+            << exit(FatalError);
+    }
+}
+
+
+void Foam::freeThread(const label index)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "freeThread : index:" << index << endl;
+    }
+    threads_[index].clear();
+}
+
+
+Foam::label Foam::allocateMutex()
+{
+    forAll(mutexes_, i)
+    {
+        if (!mutexes_[i].valid())
+        {
+            if (POSIX::debug)
+            {
+                Pout<< "allocateMutex : reusing index:" << i << endl;
+            }
+            // Reuse entry
+            mutexes_[i].reset(new pthread_mutex_t());
+            return i;
+        }
+    }
+
+    label index = mutexes_.size();
+
+    if (POSIX::debug)
+    {
+        Pout<< "allocateMutex : new index:" << index << endl;
+    }
+    mutexes_.append(autoPtr<pthread_mutex_t>(new pthread_mutex_t()));
+    return index;
+}
+
+
+void Foam::lockMutex(const label index)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "lockMutex : index:" << index << endl;
+    }
+    if (pthread_mutex_lock(&mutexes_[index]()))
+    {
+        FatalErrorInFunction << "Failed locking mutex " << index
+            << exit(FatalError);
+    }
+}
+
+
+void Foam::unlockMutex(const label index)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "unlockMutex : index:" << index << endl;
+    }
+    if (pthread_mutex_unlock(&mutexes_[index]()))
+    {
+        FatalErrorInFunction << "Failed unlocking mutex " << index
+            << exit(FatalError);
+    }
+}
+
+
+void Foam::freeMutex(const label index)
+{
+    if (POSIX::debug)
+    {
+        Pout<< "freeMutex : index:" << index << endl;
+    }
+    mutexes_[index].clear();
+}
+
+
 // ************************************************************************* //
diff --git a/src/OSspecific/POSIX/fileStat.C b/src/OSspecific/POSIX/fileStat.C
index 9826983d6..37994508c 100644
--- a/src/OSspecific/POSIX/fileStat.C
+++ b/src/OSspecific/POSIX/fileStat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,12 @@ Foam::fileStat::fileStat()
 {}
 
 
-Foam::fileStat::fileStat(const fileName& fName, const unsigned int maxTime)
+Foam::fileStat::fileStat
+(
+    const fileName& fName,
+    const bool followLink,
+    const unsigned int maxTime
+)
 {
     // Work on volatile
     volatile bool locIsValid = false;
@@ -47,13 +52,27 @@ Foam::fileStat::fileStat(const fileName& fName, const unsigned int maxTime)
 
     if (!timedOut(myTimer))
     {
-        if (::stat(fName.c_str(), &status_) != 0)
+        if (followLink)
         {
-            locIsValid = false;
+            if (::stat(fName.c_str(), &status_) != 0)
+            {
+                locIsValid = false;
+            }
+            else
+            {
+                locIsValid = true;
+            }
         }
         else
         {
-            locIsValid = true;
+            if (::lstat(fName.c_str(), &status_) != 0)
+            {
+                locIsValid = false;
+            }
+            else
+            {
+                locIsValid = true;
+            }
         }
     }
 
diff --git a/src/OSspecific/POSIX/fileStat.H b/src/OSspecific/POSIX/fileStat.H
index fe16d2047..80ff2b0a5 100644
--- a/src/OSspecific/POSIX/fileStat.H
+++ b/src/OSspecific/POSIX/fileStat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,8 +79,15 @@ public:
         //- Empty constructor
         fileStat();
 
-        //- Construct from components
-        fileStat(const fileName& fName, const unsigned int maxTime=0);
+        //- Construct from components.
+        //  followLink : in case of link get status of pointed-to file
+        //  maxTime    : time out
+        fileStat
+        (
+            const fileName& fName,
+            const bool followLink = true,
+            const unsigned int maxTime = 0
+        );
 
         //- Construct from Istream
         fileStat(Istream&);
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index ae91c5df8..5a7b6c674 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,7 +143,7 @@ public:
             //- Return the number of (groups)
             inline int ngroups() const
             {
-                return preg_ ? preg_->re_nsub : 0;
+                return int(preg_ ? preg_->re_nsub : 0);
             }
 
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index ee25734b0..b6e70668b 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -5,6 +5,14 @@ global/argList/argList.C
 global/clock/clock.C
 global/etcFiles/etcFiles.C
 
+fileOps = global/fileOperations
+$(fileOps)/fileOperation/fileOperation.C
+$(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
+$(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+$(fileOps)/collatedFileOperation/collatedFileOperation.C
+$(fileOps)/collatedFileOperation/threadedCollatedOFstream.C
+$(fileOps)/collatedFileOperation/OFstreamCollator.C
+
 bools = primitives/bools
 $(bools)/bool/bool.C
 $(bools)/bool/boolIO.C
@@ -161,6 +169,7 @@ $(gzstream)/gzstream.C
 Fstreams = $(Streams)/Fstreams
 $(Fstreams)/IFstream.C
 $(Fstreams)/OFstream.C
+$(Fstreams)/masterOFstream.C
 
 Tstreams = $(Streams)/Tstreams
 $(Tstreams)/ITstream.C
@@ -210,10 +219,16 @@ $(functionEntries)/inputModeEntry/inputModeEntry.C
 $(functionEntries)/removeEntry/removeEntry.C
 
 IOdictionary = db/IOobjects/IOdictionary
+$(IOdictionary)/baseIOdictionary.C
+$(IOdictionary)/baseIOdictionaryIO.C
 $(IOdictionary)/IOdictionary.C
-$(IOdictionary)/IOdictionaryIO.C
+$(IOdictionary)/localIOdictionary.C
+$(IOdictionary)/unwatchedIOdictionary.C
 
 db/IOobjects/IOMap/IOMapName.C
+db/IOobjects/decomposedBlockData/decomposedBlockData.C
+db/IOobjects/GlobalIOField/GlobalIOFields.C
+
 
 IOobject = db/IOobject
 $(IOobject)/IOobject.C
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 8c8f30ac0..50b94b435 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,71 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(IOobject, 0);
+
+    template<>
+    const char* NamedEnum
+    <
+        IOobject::fileCheckTypes,
+        4
+    >::names[] =
+    {
+        "timeStamp",
+        "timeStampMaster",
+        "inotify",
+        "inotifyMaster"
+    };
+}
+
+
+const Foam::NamedEnum<Foam::IOobject::fileCheckTypes, 4>
+    Foam::IOobject::fileCheckTypesNames;
+
+// Default fileCheck type
+Foam::IOobject::fileCheckTypes Foam::IOobject::fileModificationChecking
+(
+    fileCheckTypesNames.read
+    (
+        debug::optimisationSwitches().lookup
+        (
+            "fileModificationChecking"
+        )
+    )
+);
+
+namespace Foam
+{
+    // Register re-reader
+    class addfileModificationCheckingToOpt
+    :
+        public ::Foam::simpleRegIOobject
+    {
+    public:
+
+        addfileModificationCheckingToOpt(const char* name)
+        :
+            ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
+        {}
+
+        virtual ~addfileModificationCheckingToOpt()
+        {}
+
+        virtual void readData(Foam::Istream& is)
+        {
+            IOobject::fileModificationChecking =
+                IOobject::fileCheckTypesNames.read(is);
+        }
+
+        virtual void writeData(Foam::Ostream& os) const
+        {
+            os <<  IOobject::fileCheckTypesNames
+                [IOobject::fileModificationChecking];
+        }
+    };
+
+    addfileModificationCheckingToOpt addfileModificationCheckingToOpt_
+    (
+        "fileModificationChecking"
+    );
 }
 
 
@@ -129,6 +194,7 @@ Foam::IOobject::IOobject
     rOpt_(ro),
     wOpt_(wo),
     registerObject_(registerObject),
+    globalObject_(false),
     objState_(GOOD)
 {
     if (objectRegistry::debug)
@@ -149,7 +215,8 @@ Foam::IOobject::IOobject
     const objectRegistry& registry,
     readOption ro,
     writeOption wo,
-    bool registerObject
+    bool registerObject,
+    bool globalObject
 )
 :
     name_(name),
@@ -161,6 +228,7 @@ Foam::IOobject::IOobject
     rOpt_(ro),
     wOpt_(wo),
     registerObject_(registerObject),
+    globalObject_(globalObject),
     objState_(GOOD)
 {
     if (objectRegistry::debug)
@@ -179,7 +247,8 @@ Foam::IOobject::IOobject
     const objectRegistry& registry,
     readOption ro,
     writeOption wo,
-    bool registerObject
+    bool registerObject,
+    bool globalObject
 )
 :
     name_(),
@@ -191,6 +260,7 @@ Foam::IOobject::IOobject
     rOpt_(ro),
     wOpt_(wo),
     registerObject_(registerObject),
+    globalObject_(globalObject),
     objState_(GOOD)
 {
     if (!fileNameComponents(path, instance_, local_, name_))
@@ -210,6 +280,46 @@ Foam::IOobject::IOobject
 }
 
 
+Foam::IOobject::IOobject
+(
+    const IOobject& io,
+    const objectRegistry& registry
+)
+:
+    name_(io.name_),
+    headerClassName_(io.headerClassName_),
+    note_(io.note_),
+    instance_(io.instance_),
+    local_(io.local_),
+    db_(registry),
+    rOpt_(io.rOpt_),
+    wOpt_(io.wOpt_),
+    registerObject_(io.registerObject_),
+    globalObject_(io.globalObject_),
+    objState_(io.objState_)
+{}
+
+
+Foam::IOobject::IOobject
+(
+    const IOobject& io,
+    const word& name
+)
+:
+    name_(name),
+    headerClassName_(io.headerClassName_),
+    note_(io.note_),
+    instance_(io.instance_),
+    local_(io.local_),
+    db_(io.db_),
+    rOpt_(io.rOpt_),
+    wOpt_(io.wOpt_),
+    registerObject_(io.registerObject_),
+    globalObject_(io.globalObject_),
+    objState_(io.objState_)
+{}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 Foam::IOobject::~IOobject()
@@ -296,144 +406,17 @@ Foam::fileName Foam::IOobject::path
 }
 
 
-Foam::fileName Foam::IOobject::filePath() const
+Foam::fileName Foam::IOobject::localFilePath(const word& typeName) const
 {
-    if (instance().isAbsolute())
-    {
-        fileName objectPath = instance()/name();
-        if (isFile(objectPath))
-        {
-            return objectPath;
-        }
-        else
-        {
-            return fileName::null;
-        }
-    }
-    else
-    {
-        fileName path = this->path();
-        fileName objectPath = path/name();
-
-        if (isFile(objectPath))
-        {
-            return objectPath;
-        }
-        else
-        {
-            if
-            (
-                time().processorCase()
-             && (
-                    instance() == time().system()
-                 || instance() == time().constant()
-                )
-            )
-            {
-                fileName parentObjectPath =
-                    rootPath()/time().globalCaseName()
-                   /instance()/db_.dbDir()/local()/name();
-
-                if (isFile(parentObjectPath))
-                {
-                    return parentObjectPath;
-                }
-            }
-
-            if (!isDir(path))
-            {
-                word newInstancePath = time().findInstancePath
-                (
-                    instant(instance())
-                );
-
-                if (newInstancePath.size())
-                {
-                    fileName fName
-                    (
-                        rootPath()/caseName()
-                       /newInstancePath/db_.dbDir()/local()/name()
-                    );
-
-                    if (isFile(fName))
-                    {
-                        return fName;
-                    }
-                }
-            }
-        }
-
-        return fileName::null;
-    }
+    // Do not check for undecomposed files
+    return fileHandler().filePath(false, *this, typeName);
 }
 
 
-Foam::Istream* Foam::IOobject::objectStream()
+Foam::fileName Foam::IOobject::globalFilePath(const word& typeName) const
 {
-    return objectStream(filePath());
-}
-
-
-Foam::Istream* Foam::IOobject::objectStream(const fileName& fName)
-{
-    if (fName.size())
-    {
-        IFstream* isPtr = new IFstream(fName);
-
-        if (isPtr->good())
-        {
-            return isPtr;
-        }
-        else
-        {
-            delete isPtr;
-            return nullptr;
-        }
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-
-bool Foam::IOobject::headerOk()
-{
-    bool ok = true;
-
-    Istream* isPtr = objectStream();
-
-    // If the stream has failed return
-    if (!isPtr)
-    {
-        if (objectRegistry::debug)
-        {
-            InfoInFunction
-                << "File " << objectPath() << " could not be opened"
-                << endl;
-        }
-
-        ok = false;
-    }
-    else
-    {
-        // Try reading header
-        if (!readHeader(*isPtr))
-        {
-            if (objectRegistry::debug)
-            {
-                IOWarningInFunction((*isPtr))
-                    << "Failed to read header of file " << objectPath()
-                    << endl;
-            }
-
-            ok = false;
-        }
-    }
-
-    delete isPtr;
-
-    return ok;
+    // Check for undecomposed files
+    return fileHandler().filePath(true, *this, typeName);
 }
 
 
@@ -465,6 +448,7 @@ void Foam::IOobject::operator=(const IOobject& io)
     local_ = io.local_;
     rOpt_ = io.rOpt_;
     wOpt_ = io.wOpt_;
+    globalObject_ = io.globalObject_;
     objState_ = io.objState_;
 }
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index cef37bfd5..e8f387904 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "InfoProxy.H"
+#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -119,6 +120,16 @@ public:
             NO_WRITE = 1
         };
 
+        //- Enumeration defining the file checking options
+        enum fileCheckTypes
+        {
+            timeStamp,
+            timeStampMaster,
+            inotify,
+            inotifyMaster
+        };
+
+        static const NamedEnum<fileCheckTypes, 4> fileCheckTypesNames;
 
 private:
 
@@ -151,6 +162,9 @@ private:
         //- Register object created from this IOobject with registry if true
         bool registerObject_;
 
+        //- Is object same for all processors
+        bool globalObject_;
+
         //- IOobject state
         objectState objState_;
 
@@ -159,14 +173,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Construct and return an IFstream for the object.
-        //  The results is nullptr if the stream construction failed
-        Istream* objectStream();
-
-        //- Construct and return an IFstream for the object given the
-        //  exact file. The results is nullptr if the stream construction failed
-        Istream* objectStream(const fileName&);
-
         //- Set the object state to bad
         void setBad(const string&);
 
@@ -199,6 +205,9 @@ public:
         template<class Name>
         static inline word groupName(Name name, const word& group);
 
+        //- Type of file modification checking
+        static fileCheckTypes fileModificationChecking;
+
 
     // Constructors
 
@@ -222,7 +231,8 @@ public:
             const objectRegistry& registry,
             readOption r=NO_READ,
             writeOption w=NO_WRITE,
-            bool registerObject=true
+            bool registerObject=true,
+            bool globalObject = false
         );
 
         //- Construct from path, registry, io options
@@ -233,15 +243,36 @@ public:
             const objectRegistry& registry,
             readOption r=NO_READ,
             writeOption w=NO_WRITE,
-            bool registerObject=true
+            bool registerObject=true,
+            bool globalObject = false
+        );
+
+        //- Construct from copy resetting registry
+        IOobject
+        (
+            const IOobject& io,
+            const objectRegistry& registry
+        );
+
+        //- Construct from copy resetting name
+        IOobject
+        (
+            const IOobject& io,
+            const word& name
         );
 
         //- Clone
-        Foam::autoPtr<IOobject> clone() const
+        autoPtr<IOobject> clone() const
         {
             return autoPtr<IOobject>(new IOobject(*this));
         }
 
+        //- Clone resetting registry
+        autoPtr<IOobject> clone(const objectRegistry& registry) const
+        {
+            return autoPtr<IOobject>(new IOobject(*this, registry));
+        }
+
 
     //- Destructor
     virtual ~IOobject();
@@ -269,6 +300,12 @@ public:
                 return headerClassName_;
             }
 
+            //- Return name of the class name read from header
+            word& headerClassName()
+            {
+                return headerClassName_;
+            }
+
             //- Return non-constant access to the optional note
             string& note()
             {
@@ -299,6 +336,18 @@ public:
                 return registerObject_;
             }
 
+            //- Is object same for all processors
+            bool& globalObject()
+            {
+                return globalObject_;
+            }
+
+            //- Is object same for all processors
+            bool globalObject() const
+            {
+                return globalObject_;
+            }
+
 
         // Read/write options
 
@@ -366,9 +415,11 @@ public:
                 return path()/name();
             }
 
-            //- Return complete path + object name if the file exists
-            //  either in the case/processor or case otherwise null
-            fileName filePath() const;
+            //- Helper for filePath that searches locally.
+            fileName localFilePath(const word& typeName) const;
+
+            //- Helper for filePath that searches up if in parallel
+            fileName globalFilePath(const word& typeName) const;
 
 
         // Reading
@@ -376,9 +427,14 @@ public:
             //- Read header
             bool readHeader(Istream&);
 
-            //- Read and check header info
-            bool headerOk();
+            //- Read header (uses typeFilePath to find file) and check header
+            //  info. Optionally checks headerClassName against type
+            template<class Type>
+            bool typeHeaderOk(const bool checkType = true);
 
+            //- Helper: warn that type does not support re-reading
+            template<class Type>
+            void warnNoRereading() const;
 
         // Writing
 
@@ -435,6 +491,26 @@ template<>
 Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);
 
 
+//- Template function for obtaining global status
+template<class T>
+inline bool typeGlobal()
+{
+    return false;
+}
+
+//- Template function for obtaining filePath
+template<class T>
+inline fileName typeFilePath(const IOobject& io)
+{
+    return
+    (
+        typeGlobal<T>()
+      ? io.globalFilePath(T::typeName)
+      : io.localFilePath(T::typeName)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
@@ -445,6 +521,12 @@ Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "IOobjectTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobject/IOobjectIO.C b/src/OpenFOAM/db/IOobject/IOobjectIO.C
index 58664653d..2a60a8b24 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectIO.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,9 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOobject>& ip)
     os  << "IOobject: "
         << io.type() << token::SPACE
         << io.name() << token::SPACE
+        << "readOpt:" << token::SPACE << io.readOpt() << token::SPACE
+        << "writeOpt:" << token::SPACE << io.writeOpt() << token::SPACE
+        << "globalObject:" << token::SPACE << io.globalObject() << token::SPACE
         << io.path() << endl;
 
     return os;
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
new file mode 100644
index 000000000..d5d888b27
--- /dev/null
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOobject.H"
+#include "fileOperation.H"
+#include "Istream.H"
+#include "IOstreams.H"
+#include "Pstream.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::IOobject::typeHeaderOk(const bool checkType)
+{
+    bool ok = true;
+
+    // Everyone check or just master
+    bool masterOnly =
+        typeGlobal<Type>()
+     && (
+            IOobject::fileModificationChecking == timeStampMaster
+         || IOobject::fileModificationChecking == inotifyMaster
+        );
+
+    const fileOperation& fp = Foam::fileHandler();
+
+    // Determine local status
+    if (!masterOnly || Pstream::master())
+    {
+        fileName fName(typeFilePath<Type>(*this));
+
+        ok = fp.readHeader(*this, fName, Type::typeName);
+        if (ok && checkType && headerClassName_ != Type::typeName)
+        {
+            WarningInFunction
+                << "unexpected class name " << headerClassName_
+                << " expected " << Type::typeName
+                << " when reading " << fName << endl;
+
+            ok = false;
+        }
+    }
+
+    // If masterOnly make sure all processors know about it
+    if (masterOnly)
+    {
+        Pstream::scatter(ok);
+    }
+
+    return ok;
+}
+
+
+template<class Type>
+void Foam::IOobject::warnNoRereading() const
+{
+    if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << Type::typeName << ' ' << name()
+            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+            " but " << Type::typeName
+            << " does not support automatic rereading."
+            << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index bb19caf66..e41fd65c3 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
         << "    object      " << name() << ";\n"
         << "}" << nl;
 
-    writeDivider(os) << endl;
+    writeDivider(os) << nl;
 
     return true;
 }
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 08d52c17f..b4621561e 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "IOobjectList.H"
 #include "Time.H"
 #include "OSspecific.H"
-
+#include "IOList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -48,21 +48,15 @@ Foam::IOobjectList::IOobjectList
 :
     HashPtrTable<IOobject>()
 {
-    word newInstance = instance;
+    word newInstance;
+    fileNameList ObjectNames = fileHandler().readObjects
+    (
+        db,
+        instance,
+        local,
+        newInstance
+    );
 
-    if (!isDir(db.path(instance)))
-    {
-        newInstance = db.time().findInstancePath(instant(instance));
-
-        if (newInstance.empty())
-        {
-            return;
-        }
-    }
-
-    // Create a list of file names in this directory
-    fileNameList ObjectNames =
-        readDir(db.path(newInstance, db.dbDir()/local), fileName::FILE);
 
     forAll(ObjectNames, i)
     {
@@ -77,7 +71,8 @@ Foam::IOobjectList::IOobjectList
             registerObject
         );
 
-        if (objectPtr->headerOk())
+        // Use object with local scope
+        if (objectPtr->typeHeaderOk<IOList<label>>(false))
         {
             insert(ObjectNames[i], objectPtr);
         }
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index c5e369b1c..ef8e34185 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,30 +29,33 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T, class BaseType>
-void Foam::CompactIOField<T, BaseType>::readFromStream()
+void Foam::CompactIOField<T, BaseType>::readFromStream(const bool valid)
 {
-    Istream& is = readStream(word::null);
+    Istream& is = readStream(word::null, valid);
 
-    if (headerClassName() == IOField<T>::typeName)
+    if (valid)
     {
-        is >> static_cast<Field<T>&>(*this);
-        close();
-    }
-    else if (headerClassName() == typeName)
-    {
-        is >> *this;
-        close();
-    }
-    else
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "unexpected class name " << headerClassName()
-            << " expected " << typeName << " or " << IOField<T>::typeName
-            << endl
-            << "    while reading object " << name()
-            << exit(FatalIOError);
+        if (headerClassName() == IOField<T>::typeName)
+        {
+            is >> static_cast<Field<T>&>(*this);
+            close();
+        }
+        else if (headerClassName() == typeName)
+        {
+            is >> *this;
+            close();
+        }
+        else
+        {
+            FatalIOErrorInFunction
+            (
+                is
+            )   << "unexpected class name " << headerClassName()
+                << " expected " << typeName << " or " << IOField<T>::typeName
+                << endl
+                << "    while reading object " << name()
+                << exit(FatalIOError);
+        }
     }
 }
 
@@ -75,6 +78,27 @@ Foam::CompactIOField<T, BaseType>::CompactIOField(const IOobject& io)
 }
 
 
+template<class T, class BaseType>
+Foam::CompactIOField<T, BaseType>::CompactIOField
+(
+    const IOobject& io,
+    const bool valid
+)
+:
+    regIOobject(io)
+{
+    if (io.readOpt() == IOobject::MUST_READ)
+    {
+        readFromStream(valid);
+    }
+    else if (io.readOpt() == IOobject::READ_IF_PRESENT)
+    {
+        bool haveFile = headerOk();
+        readFromStream(valid && haveFile);
+    }
+}
+
+
 template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
@@ -160,7 +184,8 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     if (fmt == IOstream::ASCII)
@@ -170,7 +195,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
 
         const_cast<word&>(typeName) = IOField<T>::typeName;
 
-        bool good = regIOobject::writeObject(fmt, ver, cmp);
+        bool good = regIOobject::writeObject(fmt, ver, cmp, valid);
 
         // Change type back
         const_cast<word&>(typeName) = oldTypeName;
@@ -179,7 +204,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
     }
     else
     {
-        return regIOobject::writeObject(fmt, ver, cmp);
+        return regIOobject::writeObject(fmt, ver, cmp, valid);
     }
 }
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index 231119e6a..02fbedacc 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ class CompactIOField
     // Private Member Functions
 
         //- Read according to header type
-        void readFromStream();
+        void readFromStream(const bool valid = true);
 
 public:
 
@@ -88,6 +88,9 @@ public:
         //- Construct from IOobject
         CompactIOField(const IOobject&);
 
+        //- Construct from IOobject; does local processor require reading?
+        CompactIOField(const IOobject&, const bool valid);
+
         //- Construct from IOobject and size
         CompactIOField(const IOobject&, const label);
 
@@ -109,7 +112,8 @@ public:
         (
             IOstream::streamFormat,
             IOstream::versionNumber,
-            IOstream::compressionType
+            IOstream::compressionType,
+            const bool valid
         ) const;
 
         virtual bool writeData(Ostream&) const;
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index b742b293b..224829004 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,6 +57,23 @@ void Foam::CompactIOList<T, BaseType>::readFromStream()
 }
 
 
+template<class T, class BaseType>
+bool Foam::CompactIOList<T, BaseType>::overflows() const
+{
+    label size = 0;
+    forAll(*this, i)
+    {
+        label oldSize = size;
+        size += this->operator[](i).size();
+        if (size < oldSize)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
@@ -160,7 +177,8 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     if (fmt == IOstream::ASCII)
@@ -170,7 +188,26 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
 
         const_cast<word&>(typeName) = IOList<T>::typeName;
 
-        bool good = regIOobject::writeObject(fmt, ver, cmp);
+        bool good = regIOobject::writeObject(fmt, ver, cmp, valid);
+
+        // Change type back
+        const_cast<word&>(typeName) = oldTypeName;
+
+        return good;
+    }
+    else if (overflows())
+    {
+        WarningInFunction
+            << "Overall number of elements of CompactIOList of size "
+            << this->size() << " overflows the representation of a label"
+            << endl << "    Switching to ascii writing" << endl;
+
+        // Change type to be non-compact format type
+        const word oldTypeName = typeName;
+
+        const_cast<word&>(typeName) = IOList<T>::typeName;
+
+        bool good = regIOobject::writeObject(IOstream::ASCII, ver, cmp, valid);
 
         // Change type back
         const_cast<word&>(typeName) = oldTypeName;
@@ -179,7 +216,7 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
     }
     else
     {
-        return regIOobject::writeObject(fmt, ver, cmp);
+        return regIOobject::writeObject(fmt, ver, cmp, valid);
     }
 }
 
@@ -263,7 +300,18 @@ Foam::Ostream& Foam::operator<<
         start[0] = 0;
         for (label i = 1; i < start.size(); i++)
         {
-            start[i] = start[i-1]+L[i-1].size();
+            label prev = start[i-1];
+            start[i] = prev+L[i-1].size();
+
+            if (start[i] < prev)
+            {
+                FatalIOErrorInFunction(os)
+                    << "Overall number of elements " << start[i]
+                    << " of CompactIOList of size "
+                    << L.size() << " overflows the representation of a label"
+                    << endl << "Please recompile with a larger representation"
+                    << " for label" << exit(FatalIOError);
+            }
         }
 
         List<BaseType> elems(start[start.size()-1]);
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index 9abb60121..784347845 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,6 +79,9 @@ class CompactIOList
         //- Read according to header type
         void readFromStream();
 
+        //- Has too many elements in it?
+        bool overflows() const;
+
 public:
 
     //- Runtime type information
@@ -111,7 +114,8 @@ public:
         (
             IOstream::streamFormat,
             IOstream::versionNumber,
-            IOstream::compressionType
+            IOstream::compressionType,
+            const bool valid
         ) const;
 
         virtual bool writeData(Ostream&) const;
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
new file mode 100644
index 000000000..f42eafabd
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "GlobalIOField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::GlobalIOField<Type>::GlobalIOField(const IOobject& io)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOField<Type>>();
+
+    readHeaderOk(IOstream::BINARY, typeName);
+}
+
+
+template<class Type>
+Foam::GlobalIOField<Type>::GlobalIOField(const IOobject& io, const label size)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOField<Type>>();
+
+    if (!readHeaderOk(IOstream::BINARY, typeName))
+    {
+        Field<Type>::setSize(size);
+    }
+}
+
+
+template<class Type>
+Foam::GlobalIOField<Type>::GlobalIOField
+(
+    const IOobject& io,
+    const Field<Type>& f
+)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOField<Type>>();
+
+    if (!readHeaderOk(IOstream::BINARY, typeName))
+    {
+        Field<Type>::operator=(f);
+    }
+}
+
+
+template<class Type>
+Foam::GlobalIOField<Type>::GlobalIOField
+(
+    const IOobject& io,
+    const Xfer<Field<Type>>& f
+)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOField<Type>>();
+
+    Field<Type>::transfer(f());
+
+    readHeaderOk(IOstream::BINARY, typeName);
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::GlobalIOField<Type>::~GlobalIOField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::GlobalIOField<Type>::readData(Istream& is)
+{
+    is >> *this;
+    return is.good();
+}
+
+
+template<class Type>
+bool Foam::GlobalIOField<Type>::writeData(Ostream& os) const
+{
+    return (os << static_cast<const Field<Type>&>(*this)).good();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::GlobalIOField<Type>::operator=(const GlobalIOField<Type>& rhs)
+{
+    Field<Type>::operator=(rhs);
+}
+
+
+template<class Type>
+void Foam::GlobalIOField<Type>::operator=(const Field<Type>& rhs)
+{
+    Field<Type>::operator=(rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
new file mode 100644
index 000000000..522e33235
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::GlobalIOField
+
+Description
+    IOField with global data (so optionally read from master)
+
+SourceFiles
+    GlobalIOField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef GlobalIOField_H
+#define GlobalIOField_H
+
+#include "regIOobject.H"
+#include "Field.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class GlobalIOField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class GlobalIOField
+:
+    public regIOobject,
+    public Field<Type>
+{
+
+public:
+
+    TypeName("Field");
+
+
+    // Constructors
+
+        //- Construct from IOobject
+        GlobalIOField(const IOobject&);
+
+        //- Construct from IOobject and size (does not set values)
+        GlobalIOField(const IOobject&, const label size);
+
+        //- Construct from components
+        GlobalIOField(const IOobject&, const Field<Type>&);
+
+        //- Construct by transferring the Field contents
+        GlobalIOField(const IOobject&, const Xfer<Field<Type>>&);
+
+
+    //- Destructor
+    virtual ~GlobalIOField();
+
+
+    // Member functions
+
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
+
+        //- ReadData function required for regIOobject read operation
+        virtual bool readData(Istream&);
+
+        //- WriteData function required for regIOobject write operation
+        bool writeData(Ostream&) const;
+
+
+    // Member operators
+
+        void operator=(const GlobalIOField<Type>&);
+
+        void operator=(const Field<Type>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "GlobalIOField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOFields.C b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOFields.C
new file mode 100644
index 000000000..51080e07e
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOFields.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "GlobalIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebugWithName
+    (
+        GlobalIOField<scalar>,
+        "scalarField",
+        0
+    );
+    defineTemplateTypeNameAndDebugWithName
+    (
+        GlobalIOField<vector>,
+        "vectorField",
+        0
+    );
+    defineTemplateTypeNameAndDebugWithName
+    (
+        GlobalIOField<sphericalTensor>,
+        "sphericalTensorField",
+        0
+    );
+    defineTemplateTypeNameAndDebugWithName
+    (
+        GlobalIOField<symmTensor>,
+        "symmTensorField",
+        0
+    );
+    defineTemplateTypeNameAndDebugWithName
+    (
+        GlobalIOField<tensor>,
+        "tensorField",
+        0
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
new file mode 100644
index 000000000..1da6fe3d7
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "GlobalIOList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOList<Type>>();
+
+    readHeaderOk(IOstream::BINARY, typeName);
+}
+
+
+template<class Type>
+Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const label size)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOList<Type>>();
+
+    if (!readHeaderOk(IOstream::BINARY, typeName))
+    {
+        List<Type>::setSize(size);
+    }
+}
+
+
+template<class Type>
+Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const List<Type>& f)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOList<Type>>();
+
+    if (!readHeaderOk(IOstream::BINARY, typeName))
+    {
+        List<Type>::operator=(f);
+    }
+}
+
+
+template<class Type>
+Foam::GlobalIOList<Type>::GlobalIOList
+(
+    const IOobject& io,
+    const Xfer<List<Type>>& f
+)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOList<Type>>();
+
+    List<Type>::transfer(f());
+
+    readHeaderOk(IOstream::BINARY, typeName);
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::GlobalIOList<Type>::~GlobalIOList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::GlobalIOList<Type>::readData(Istream& is)
+{
+    is >> *this;
+    return is.good();
+}
+
+
+template<class Type>
+bool Foam::GlobalIOList<Type>::writeData(Ostream& os) const
+{
+    return (os << *this).good();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::GlobalIOList<Type>::operator=(const GlobalIOList<Type>& rhs)
+{
+    List<Type>::operator=(rhs);
+}
+
+
+template<class Type>
+void Foam::GlobalIOList<Type>::operator=(const List<Type>& rhs)
+{
+    List<Type>::operator=(rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
new file mode 100644
index 000000000..1f7cb9c46
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::GlobalIOList
+
+Description
+    IOList with global data (so optionally read from master)
+
+SourceFiles
+    GlobalIOList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef GlobalIOList_H
+#define GlobalIOList_H
+
+#include "List.H"
+#include "regIOobject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class GlobalIOList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class GlobalIOList
+:
+    public regIOobject,
+    public List<Type>
+{
+
+public:
+
+    TypeName("List");
+
+
+    // Constructors
+
+        //- Construct from IOobject
+        GlobalIOList(const IOobject&);
+
+        //- Construct from IOobject
+        GlobalIOList(const IOobject&, const label size);
+
+        //- Construct from IOobject and a List
+        GlobalIOList(const IOobject&, const List<Type>&);
+
+        //- Construct by transferring the List contents
+        GlobalIOList(const IOobject&, const Xfer<List<Type>>&);
+
+
+    //- Destructor
+    virtual ~GlobalIOList();
+
+
+    // Member functions
+
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
+
+        //- ReadData function required for regIOobject read operation
+        virtual bool readData(Istream&);
+
+        //- WriteData function required for regIOobject write operation
+        bool writeData(Ostream&) const;
+
+
+    // Member operators
+
+        void operator=(const GlobalIOList<Type>&);
+
+        void operator=(const List<Type>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "GlobalIOList.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.C b/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.C
new file mode 100644
index 000000000..6dbef5df6
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "globalIOLists.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTemplateTypeNameWithName(labelGlobalIOList, "labelList");
+    defineTemplateTypeNameWithName(scalarGlobalIOList, "scalarList");
+    defineTemplateTypeNameWithName(vectorGlobalIOList, "vectorList");
+    defineTemplateTypeNameWithName
+    (
+        sphericalTensorGlobalIOList,
+        "sphericalTensorList"
+    );
+    defineTemplateTypeNameWithName(symmTensorGlobalIOList, "symmTensorList");
+    defineTemplateTypeNameWithName(tensorGlobalIOList, "tensorList");
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.H b/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.H
new file mode 100644
index 000000000..2d136c3c2
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/globalIOLists.H
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::globalIOLists
+
+Description
+    Typedefs for globalIOLists of primitive types. These are fully compatible
+    with 'normal' IOLists except have global filePath() scope.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef globalIOLists_H
+#define globalIOLists_H
+
+#include "primitiveFields.H"
+#include "GlobalIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef GlobalIOList<label> labelGlobalIOList;
+    typedef GlobalIOList<scalar> scalarGlobalIOList;
+    typedef GlobalIOList<vector> vectorGlobalIOList;
+    typedef GlobalIOList<sphericalTensor> sphericalTensorGlobalIOList;
+    typedef GlobalIOList<symmTensor> symmTensorGlobalIOList;
+    typedef GlobalIOList<tensor> tensorGlobalIOList;
+
+    //- Template function for obtaining global status
+    template<>
+    inline bool typeGlobal<labelGlobalIOList>()
+    {
+        return true;
+    }
+    template<>
+    inline bool typeGlobal<scalarGlobalIOList>()
+    {
+        return true;
+    }
+    template<>
+    inline bool typeGlobal<vectorGlobalIOList>()
+    {
+        return true;
+    }
+    template<>
+    inline bool typeGlobal<sphericalTensorGlobalIOList>()
+    {
+        return true;
+    }
+    template<>
+    inline bool typeGlobal<symmTensorGlobalIOList>()
+    {
+        return true;
+    }
+    template<>
+    inline bool typeGlobal<tensorGlobalIOList>()
+    {
+        return true;
+    }
+
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 5002c32f2..89ebaca6b 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,15 +32,8 @@ Foam::IOField<Type>::IOField(const IOobject& io)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOField " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOField does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOField<Type>>();
 
     if
     (
@@ -57,20 +50,50 @@ Foam::IOField<Type>::IOField(const IOobject& io)
 }
 
 
+template<class Type>
+Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOField<Type>>();
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+    )
+    {
+        Istream& is = readStream(typeName, valid);
+
+        if (valid)
+        {
+            is >> *this;
+        }
+        close();
+    }
+    else if (io.readOpt() == IOobject::READ_IF_PRESENT)
+    {
+        bool haveFile = headerOk();
+
+        Istream& is = readStream(typeName, haveFile && valid);
+
+        if (valid && haveFile)
+        {
+            is >> *this;
+        }
+        close();
+    }
+}
+
+
 template<class Type>
 Foam::IOField<Type>::IOField(const IOobject& io, const label size)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOField " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOField does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOField<Type>>();
 
     if
     (
@@ -96,15 +119,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOField " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOField does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOField<Type>>();
 
     if
     (
@@ -130,15 +146,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOField " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOField does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOField<Type>>();
 
     Field<Type>::transfer(f());
 
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index c5029307d..768c8b05e 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,6 +64,9 @@ public:
         //- Construct from IOobject
         IOField(const IOobject&);
 
+        //- Construct from IOobject; does local processor require reading?
+        IOField(const IOobject&, const bool valid);
+
         //- Construct from IOobject and size (does not set values)
         IOField(const IOobject&, const label size);
 
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 3fd35a5d0..1d2549894 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,15 +32,9 @@ Foam::IOList<T>::IOList(const IOobject& io)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOList " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOList does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOList<T>>();
+
     if
     (
         (
@@ -61,15 +55,9 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOList " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOList does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOList<T>>();
+
     if
     (
         (
@@ -94,15 +82,8 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOList " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOList does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOList<T>>();
 
     if
     (
@@ -128,15 +109,8 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
 :
     regIOobject(io)
 {
-    // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-    {
-        WarningInFunction
-            << "IOList " << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOList does not support automatic rereading."
-            << endl;
-    }
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOList<T>>();
 
     List<T>::transfer(list());
 
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index 4701df554..3e1cea8c9 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,9 @@ Foam::IOMap<T>::IOMap(const IOobject& io)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         readStream(typeName) >> *this;
         close();
     }
@@ -60,6 +63,9 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const label size)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         readStream(typeName) >> *this;
         close();
     }
@@ -84,6 +90,9 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         readStream(typeName) >> *this;
         close();
     }
@@ -110,6 +119,9 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         readStream(typeName) >> *this;
         close();
     }
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index 0f2afa982..5dce64772 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ Class
 
 Description
     A Map of objects of type \<T\> with automated input and output.
+    Is a global object; i.e. can be read from undecomposed case.
 
 SourceFiles
     IOMap.C
@@ -83,6 +84,18 @@ public:
 
         bool writeData(Ostream&) const;
 
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
 
     // Member operators
 
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
index c13fbcf9e..1eb9583e0 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.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-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,13 @@ License
 namespace Foam
 {
     defineTemplateTypeNameAndDebug(IOMap<dictionary>, 0);
+
+    //- Template specialisation for obtaining filePath
+    template<>
+    fileName typeFilePath<IOMap<dictionary>>(const IOobject& io)
+    {
+        return io.globalFilePath(IOMap<dictionary>::typeName);
+    }
 }
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index 1c806bfab..9e39ab515 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,9 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const INew& inewt)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         PtrList<T>::read(readStream(typeName), inewt);
         close();
     }
@@ -62,6 +65,9 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         PtrList<T>::read(readStream(typeName), INew<T>());
         close();
     }
@@ -97,6 +103,9 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         PtrList<T>::read(readStream(typeName), INew<T>());
         close();
     }
@@ -123,6 +132,9 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
+        // For if MUST_READ_IF_MODIFIED
+        addWatch();
+
         PtrList<T>::read(readStream(typeName), INew<T>());
         close();
     }
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index d14ffb8e0..987e930f1 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,149 +24,55 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IOdictionary.H"
-#include "objectRegistry.H"
-#include "Pstream.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-defineTypeNameAndDebug(IOdictionary, 0);
-
-bool IOdictionary::writeDictionaries
-(
-    debug::infoSwitch("writeDictionaries", 0)
-);
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::IOdictionary::IOdictionary(const IOobject& io)
 :
-    regIOobject(io)
+    baseIOdictionary(io)
 {
-    // Temporary warning
-    if (debug && io.readOpt() == IOobject::MUST_READ)
-    {
-        WarningInFunction
-            << "Dictionary " << name()
-            << " constructed with IOobject::MUST_READ"
-            " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
-            << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
-            << endl;
-    }
+    readHeaderOk(IOstream::ASCII, typeName);
 
-    // Everyone check or just master
-    bool masterOnly =
-        regIOobject::fileModificationChecking == timeStampMaster
-     || regIOobject::fileModificationChecking == inotifyMaster;
-
-
-    // Check if header is ok for READ_IF_PRESENT
-    bool isHeaderOk = false;
-    if (io.readOpt() == IOobject::READ_IF_PRESENT)
-    {
-        if (masterOnly)
-        {
-            if (Pstream::master())
-            {
-                isHeaderOk = headerOk();
-            }
-            Pstream::scatter(isHeaderOk);
-        }
-        else
-        {
-            isHeaderOk = headerOk();
-        }
-    }
-
-
-    if
-    (
-        (
-            io.readOpt() == IOobject::MUST_READ
-         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
-        )
-     || isHeaderOk
-    )
-    {
-        readFile(masterOnly);
-    }
-
-    dictionary::name() = IOobject::objectPath();
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
 }
 
 
-Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
+Foam::IOdictionary::IOdictionary
+(
+    const IOobject& io,
+    const dictionary& dict
+)
 :
-    regIOobject(io)
+    baseIOdictionary(io, dict)
 {
-    // Temporary warning
-    if (debug && io.readOpt() == IOobject::MUST_READ)
-    {
-        WarningInFunction
-            << "Dictionary " << name()
-            << " constructed with IOobject::MUST_READ"
-            " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
-            << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
-            << endl;
-    }
-
-    // Everyone check or just master
-    bool masterOnly =
-        regIOobject::fileModificationChecking == timeStampMaster
-     || regIOobject::fileModificationChecking == inotifyMaster;
-
-
-    // Check if header is ok for READ_IF_PRESENT
-    bool isHeaderOk = false;
-    if (io.readOpt() == IOobject::READ_IF_PRESENT)
-    {
-        if (masterOnly)
-        {
-            if (Pstream::master())
-            {
-                isHeaderOk = headerOk();
-            }
-            Pstream::scatter(isHeaderOk);
-        }
-        else
-        {
-            isHeaderOk = headerOk();
-        }
-    }
-
-
-    if
-    (
-        (
-            io.readOpt() == IOobject::MUST_READ
-         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
-        )
-     || isHeaderOk
-    )
-    {
-        readFile(masterOnly);
-    }
-    else
+    if (!readHeaderOk(IOstream::ASCII, typeName))
     {
         dictionary::operator=(dict);
     }
 
-    dictionary::name() = IOobject::objectPath();
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
 }
 
 
-Foam::IOdictionary::IOdictionary(const IOobject& io, Istream& is)
+Foam::IOdictionary::IOdictionary
+(
+    const IOobject& io,
+    Istream& is
+)
 :
-    regIOobject(io)
+    baseIOdictionary(io, is)
 {
-    dictionary::name() = IOobject::objectPath();
-    // Note that we do construct the dictionary null and read in afterwards
-    // so that if there is some fancy massaging due to a functionEntry in
+    // Note that we do construct the dictionary null and read in
+    // afterwards
+    // so that if there is some fancy massaging due to a
+    // functionEntry in
     // the dictionary at least the type information is already complete.
     is  >> *this;
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
 }
 
 
@@ -176,20 +82,4 @@ Foam::IOdictionary::~IOdictionary()
 {}
 
 
-// * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
-
-const Foam::word& Foam::IOdictionary::name() const
-{
-    return regIOobject::name();
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::IOdictionary::operator=(const IOdictionary& rhs)
-{
-    dictionary::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index c9f6aefe8..82eae7d95 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ Class
 Description
     IOdictionary is derived from dictionary and IOobject to give the dictionary
     automatic IO functionality via the objectRegistry.  To facilitate IO,
-    IOdictioanry is provided with a constructor from IOobject and writeData and
+    IOdictionary is provided with a constructor from IOobject and writeData and
     write functions.
 
 SourceFiles
@@ -39,8 +39,7 @@ SourceFiles
 #ifndef IOdictionary_H
 #define IOdictionary_H
 
-#include "dictionary.H"
-#include "regIOobject.H"
+#include "baseIOdictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,27 +52,11 @@ namespace Foam
 
 class IOdictionary
 :
-    public regIOobject,
-    public dictionary
+    public baseIOdictionary
 {
-    // Private data
-
-        static bool writeDictionaries;
-
-
-    // Private Member Functions
-
-        //- Read dictionary from file
-        //  Parallel aware reading, using non-virtual type information
-        //  (typeName instead of type()) because of use in constructor.
-        void readFile(const bool);
-
 
 public:
 
-    TypeName("dictionary");
-
-
     // Constructors
 
         //- Construct given an IOobject
@@ -92,24 +75,29 @@ public:
 
     // Member functions
 
-        //- Name function is needed to disambiguate those inherited
-        //  from regIOobject and dictionary
-        const word& name() const;
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
 
-        //- ReadData function required for regIOobject read operation
-        bool readData(Istream&);
-
-        //- WriteData function required for regIOobject write operation
-        bool writeData(Ostream&) const;
-
-
-    // Member operators
-
-        //- Assignment of other IOdictionary's entries to this IOdictionary
-        void operator=(const IOdictionary&);
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
 };
 
 
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<IOdictionary>()
+{
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
index 594e5b1ac..5f582ae15 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
@@ -26,114 +26,6 @@ License
 #include "IOdictionary.H"
 #include "Pstream.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::IOdictionary::readFile(const bool masterOnly)
-{
-    if (Pstream::master() || !masterOnly)
-    {
-        if (debug)
-        {
-            Pout<< "IOdictionary : Reading " << objectPath()
-                << " from file " << endl;
-        }
-
-        // Set flag for e.g. codeStream
-        bool oldFlag = regIOobject::masterOnlyReading;
-        regIOobject::masterOnlyReading = masterOnly;
-
-        // Read file
-        readStream(typeName) >> *this;
-        close();
-
-        regIOobject::masterOnlyReading = oldFlag;
-
-        if (writeDictionaries && Pstream::master())
-        {
-            Sout<< nl
-                << "--- IOdictionary " << name()
-                << ' ' << objectPath() << ":" << nl;
-            writeHeader(Sout);
-            writeData(Sout);
-            Sout<< "--- End of IOdictionary " << name() << nl << endl;
-        }
-    }
-
-    if (masterOnly && Pstream::parRun())
-    {
-        // Scatter master data using communication scheme
-
-        const List<Pstream::commsStruct>& comms =
-        (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
-          ? Pstream::linearCommunication()
-          : Pstream::treeCommunication()
-        );
-
-        // Master reads headerclassname from file. Make sure this gets
-        // transfered as well as contents.
-        Pstream::scatter
-        (
-            comms,
-            const_cast<word&>(headerClassName()),
-            Pstream::msgType(),
-            Pstream::worldComm
-        );
-        Pstream::scatter(comms, note(), Pstream::msgType(), Pstream::worldComm);
-
-        // Get my communication order
-        const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
-
-        // Reveive from up
-        if (myComm.above() != -1)
-        {
-            if (debug)
-            {
-                Pout<< "IOdictionary : Reading " << objectPath()
-                    << " from processor " << myComm.above() << endl;
-            }
-
-            // Note: use ASCII for now - binary IO of dictionaries is
-            // not currently supported or rather the primitiveEntries of
-            // the dictionary think they are in binary form whereas they are
-            // not. Could reset all the ITstreams to ascii?
-            IPstream fromAbove
-            (
-                Pstream::commsTypes::scheduled,
-                myComm.above(),
-                0,
-                Pstream::msgType(),
-                Pstream::worldComm,
-                IOstream::ASCII
-            );
-            IOdictionary::readData(fromAbove);
-        }
-
-        // Send to my downstairs neighbours. Note reverse order not
-        // necessary here but just for consistency with other uses
-        // (e.g. gatherScatter.C)
-        forAllReverse(myComm.below(), belowI)
-        {
-            if (debug)
-            {
-                Pout<< "IOdictionary : Sending " << objectPath()
-                    << " to processor " << myComm.below()[belowI] << endl;
-            }
-            OPstream toBelow
-            (
-                Pstream::commsTypes::scheduled,
-                myComm.below()[belowI],
-                0,
-                Pstream::msgType(),
-                Pstream::worldComm,
-                IOstream::ASCII
-            );
-            IOdictionary::writeData(toBelow);
-        }
-    }
-}
-
-
 // * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
 
 bool Foam::IOdictionary::readData(Istream& is)
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.C
new file mode 100644
index 000000000..21ed35818
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.C
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "baseIOdictionary.H"
+#include "objectRegistry.H"
+#include "Pstream.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(baseIOdictionary, 0);
+
+bool baseIOdictionary::writeDictionaries
+(
+    debug::infoSwitch("writeDictionaries", 0)
+);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::baseIOdictionary::baseIOdictionary(const IOobject& io)
+:
+    regIOobject(io)
+{
+    dictionary::name() = IOobject::objectPath();
+}
+
+
+Foam::baseIOdictionary::baseIOdictionary
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    regIOobject(io)
+{
+    dictionary::name() = IOobject::objectPath();
+}
+
+
+Foam::baseIOdictionary::baseIOdictionary
+(
+    const IOobject& io,
+    Istream& is
+)
+:
+    regIOobject(io)
+{
+    dictionary::name() = IOobject::objectPath();
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+Foam::baseIOdictionary::~baseIOdictionary()
+{}
+
+
+// * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
+
+const Foam::word& Foam::baseIOdictionary::name() const
+{
+    return regIOobject::name();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::baseIOdictionary::operator=(const baseIOdictionary& rhs)
+{
+    dictionary::operator=(rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
new file mode 100644
index 000000000..43a199e89
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::baseIOdictionary
+
+Description
+    baseIOdictionary is derived from dictionary and IOobject to give the
+    dictionary automatic IO functionality via the objectRegistry.
+    To facilitate IO,
+    IOdictionary is provided with a constructor from IOobject and writeData and
+    write functions.
+
+SourceFiles
+    baseIOdictionary.C
+    baseIOdictionaryIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef baseIOdictionary_H
+#define baseIOdictionary_H
+
+#include "dictionary.H"
+#include "regIOobject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class baseIOdictionary Declaration
+\*---------------------------------------------------------------------------*/
+
+class baseIOdictionary
+:
+    public regIOobject,
+    public dictionary
+{
+    // Private data
+
+        static bool writeDictionaries;
+
+public:
+
+    TypeName("dictionary");
+
+
+    // Constructors
+
+        //- Construct given an IOobject
+        baseIOdictionary(const IOobject&);
+
+        //- Construct given an IOobject and dictionary
+        baseIOdictionary(const IOobject&, const dictionary&);
+
+        //- Construct given an IOobject and Istream
+        baseIOdictionary(const IOobject&, Istream&);
+
+
+    //- Destructor
+    virtual ~baseIOdictionary();
+
+
+    // Member functions
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const = 0;
+
+        //- Name function is needed to disambiguate those inherited
+        //  from regIOobject and dictionary
+        const word& name() const;
+
+        //- ReadData function required for regIOobject read operation
+        virtual bool readData(Istream&);
+
+        //- WriteData function required for regIOobject write operation
+        virtual bool writeData(Ostream&) const;
+
+        //- Is object global
+        virtual bool global() const = 0;
+
+
+    // Member operators
+
+        //- Assignment of other baseIOdictionary's entries to this
+        //  baseIOdictionary
+        void operator=(const baseIOdictionary&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionaryIO.C b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionaryIO.C
new file mode 100644
index 000000000..e3eb7332f
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionaryIO.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "baseIOdictionary.H"
+#include "Pstream.H"
+
+// * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
+
+bool Foam::baseIOdictionary::readData(Istream& is)
+{
+    is >> *this;
+
+    if (writeDictionaries && Pstream::master() && !is.bad())
+    {
+        Sout<< nl
+            << "--- baseIOdictionary " << name()
+            << ' ' << objectPath() << ":" << nl;
+        writeHeader(Sout);
+        writeData(Sout);
+        Sout<< "--- End of baseIOdictionary " << name() << nl << endl;
+    }
+
+    return !is.bad();
+}
+
+
+bool Foam::baseIOdictionary::writeData(Ostream& os) const
+{
+    dictionary::write(os, false);
+    return os.good();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C
new file mode 100644
index 000000000..e431cd5bd
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "localIOdictionary.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::localIOdictionary::localIOdictionary(const IOobject& io)
+:
+    baseIOdictionary(io)
+{
+    readHeaderOk(IOstream::ASCII, typeName);
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+Foam::localIOdictionary::localIOdictionary
+(
+    const IOobject& io,
+    const word& wantedType
+)
+:
+    baseIOdictionary(io)
+{
+    readHeaderOk(IOstream::ASCII, wantedType);
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+Foam::localIOdictionary::localIOdictionary
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    baseIOdictionary(io, dict)
+{
+    if (!readHeaderOk(IOstream::ASCII, typeName))
+    {
+        dictionary::operator=(dict);
+    }
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+Foam::localIOdictionary::localIOdictionary
+(
+    const IOobject& io,
+    Istream& is
+)
+:
+    baseIOdictionary(io, is)
+{
+    // Note that we do construct the dictionary null and read in
+    // afterwards
+    // so that if there is some fancy massaging due to a
+    // functionEntry in
+    // the dictionary at least the type information is already complete.
+    is  >> *this;
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+Foam::localIOdictionary::~localIOdictionary()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H
new file mode 100644
index 000000000..c02c4a86a
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::localIOdictionary
+
+Description
+    localIOdictionary is derived from IOdictionary but excludes parallel
+    master reading.
+
+SourceFiles
+    localIOdictionary.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef localIOdictionary_H
+#define localIOdictionary_H
+
+#include "baseIOdictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class localIOdictionary Declaration
+\*---------------------------------------------------------------------------*/
+
+class localIOdictionary
+:
+    public baseIOdictionary
+{
+
+public:
+
+    // Constructors
+
+        //- Construct given an IOobject
+        localIOdictionary(const IOobject& io);
+
+        //- Construct given an IOobject and dictionary
+        localIOdictionary(const IOobject& io, const dictionary& dict);
+
+        //- Construct given an IOobject and Istream
+        localIOdictionary(const IOobject& io, Istream& is);
+
+        //- Construct given an IOobject, supply wanted typeName
+        localIOdictionary(const IOobject& io, const word& wantedType);
+
+
+    //- Destructor
+    virtual ~localIOdictionary();
+
+
+    // Member functions
+
+        //- Is object global
+        virtual bool global() const
+        {
+            return false;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  in the case otherwise null
+        virtual fileName filePath() const
+        {
+            // Use default (local only) search strategy
+            return localFilePath(type());
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C
new file mode 100644
index 000000000..f9baf8e45
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "unwatchedIOdictionary.H"
+#include "objectRegistry.H"
+#include "Pstream.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::unwatchedIOdictionary::unwatchedIOdictionary(const IOobject& io)
+:
+    baseIOdictionary(io)
+{
+    readHeaderOk(IOstream::ASCII, typeName);
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+Foam::unwatchedIOdictionary::unwatchedIOdictionary
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    baseIOdictionary(io, dict)
+{
+    if (!readHeaderOk(IOstream::ASCII, typeName))
+    {
+        dictionary::operator=(dict);
+    }
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+Foam::unwatchedIOdictionary::unwatchedIOdictionary
+(
+    const IOobject& io,
+    Istream& is
+)
+:
+    baseIOdictionary(io, is)
+{
+    // Note that we do construct the dictionary null and read in
+    // afterwards
+    // so that if there is some fancy massaging due to a
+    // functionEntry in
+    // the dictionary at least the type information is already complete.
+    is  >> *this;
+
+    // For if MUST_READ_IF_MODIFIED
+    addWatch();
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+Foam::unwatchedIOdictionary::~unwatchedIOdictionary()
+{}
+
+
+// * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
+
+Foam::label Foam::unwatchedIOdictionary::addWatch(const fileName& f)
+{
+    label index = -1;
+
+    if (readOpt() == MUST_READ_IF_MODIFIED)
+    {
+        index = findIndex(files_, f);
+
+        if (index == -1)
+        {
+            index = files_.size();
+            files_.append(f);
+        }
+    }
+    return index;
+}
+
+
+void Foam::unwatchedIOdictionary::addWatch()
+{
+    if (readOpt() == MUST_READ_IF_MODIFIED)
+    {
+        fileName f = filePath();
+        if (!f.size())
+        {
+            // We don't have this file but would like to re-read it.
+            // Possibly if master-only reading mode.
+            f = objectPath();
+        }
+
+        if (findIndex(files_, f) != -1)
+        {
+            FatalErrorIn("regIOobject::addWatch()")
+                << "Object " << objectPath() << " of type " << type()
+                << " already watched" << abort(FatalError);
+        }
+
+        // If master-only reading only the master will have all dependencies
+        // so scatter these to slaves
+        bool masterOnly =
+            global()
+         && (
+                regIOobject::fileModificationChecking == timeStampMaster
+             || regIOobject::fileModificationChecking == inotifyMaster
+            );
+
+        if (masterOnly && Pstream::parRun())
+        {
+            Pstream::scatter(files_);
+        }
+
+        addWatch(f);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H
new file mode 100644
index 000000000..8431aa835
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::unwatchedIOdictionary
+
+Description
+    unwatchedIOdictionary is like IOdictionary but stores
+    dependencies as files instead of fileMonitor watchIndices. Used
+    to read controlDict since there fileMonitor not yet setup.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef unwatchedIOdictionary_H
+#define unwatchedIOdictionary_H
+
+#include "baseIOdictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class unwatchedIOdictionary Declaration
+\*---------------------------------------------------------------------------*/
+
+class unwatchedIOdictionary
+:
+    public baseIOdictionary
+{
+
+    fileNameList files_;
+
+public:
+
+    // Constructors
+
+        //- Construct given an IOobject
+        unwatchedIOdictionary(const IOobject& io);
+
+        //- Construct given an IOobject and dictionary
+        unwatchedIOdictionary
+        (
+            const IOobject& io,
+            const dictionary& dict
+        );
+
+        //- Construct given an IOobject and Istream
+        unwatchedIOdictionary(const IOobject& io, Istream& is);
+
+    //- Destructor
+    virtual ~unwatchedIOdictionary();
+
+
+    // Member functions
+
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
+
+        //- Add file watch on object (READ_IF_MODIFIED)
+        virtual void addWatch();
+
+        //- Add file watch for fileName on object if not yet watched. Return
+        //  index of watch
+        virtual label addWatch(const fileName&);
+
+        const fileNameList& files() const
+        {
+            return files_;
+        }
+
+        fileNameList& files()
+        {
+            return files_;
+        }
+
+};
+
+
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<unwatchedIOdictionary>()
+{
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
new file mode 100644
index 000000000..7afbd2fb8
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -0,0 +1,921 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "decomposedBlockData.H"
+#include "OPstream.H"
+#include "IPstream.H"
+#include "PstreamBuffers.H"
+#include "OFstream.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "dictionary.H"
+#include <sys/time.h>
+#include "objectRegistry.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(decomposedBlockData, 0);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decomposedBlockData::decomposedBlockData
+(
+    const label comm,
+    const IOobject& io,
+    const UPstream::commsTypes commsType
+)
+:
+    regIOobject(io),
+    commsType_(commsType),
+    comm_(comm)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "decomposedBlockData " << name()
+            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+            " but decomposedBlockData does not support automatic rereading."
+            << endl;
+    }
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        read();
+    }
+}
+
+
+Foam::decomposedBlockData::decomposedBlockData
+(
+    const label comm,
+    const IOobject& io,
+    const UList<char>& list,
+    const UPstream::commsTypes commsType
+)
+:
+    regIOobject(io),
+    commsType_(commsType),
+    comm_(comm)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "decomposedBlockData " << name()
+            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+            " but decomposedBlockData does not support automatic rereading."
+            << endl;
+    }
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        read();
+    }
+    else
+    {
+        List<char>::operator=(list);
+    }
+}
+
+
+Foam::decomposedBlockData::decomposedBlockData
+(
+    const label comm,
+    const IOobject& io,
+    const Xfer<List<char>>& list,
+    const UPstream::commsTypes commsType
+)
+:
+    regIOobject(io),
+    commsType_(commsType),
+    comm_(comm)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "decomposedBlockData " << name()
+            << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+            " but decomposedBlockData does not support automatic rereading."
+            << endl;
+    }
+
+    List<char>::transfer(list());
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+Foam::decomposedBlockData::~decomposedBlockData()
+{}
+
+
+// * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
+
+bool Foam::decomposedBlockData::readMasterHeader(IOobject& io, Istream& is)
+{
+    if (debug)
+    {
+        Pout<< "decomposedBlockData::readMasterHeader:"
+            << " stream:" << is.name() << endl;
+    }
+
+    // Master-only reading of header
+    is.fatalCheck("read(Istream&)");
+
+    List<char> data(is);
+    is.fatalCheck("read(Istream&) : reading entry");
+    string buf(data.begin(), data.size());
+    IStringStream str(is.name(), buf);
+
+    return io.readHeader(str);
+}
+
+
+void Foam::decomposedBlockData::writeHeader
+(
+    Ostream& os,
+    const IOstream::versionNumber version,
+    const IOstream::streamFormat format,
+    const word& type,
+    const string& note,
+    const fileName& location,
+    const word& name
+)
+{
+    IOobject::writeBanner(os)
+        << "FoamFile\n{\n"
+        << "    version     " << version << ";\n"
+        << "    format      " << format << ";\n"
+        << "    class       " << type << ";\n";
+    if (note.size())
+    {
+        os  << "    note        " << note << ";\n";
+    }
+
+    if (location.size())
+    {
+        os  << "    location    " << location << ";\n";
+    }
+
+    os  << "    object      " << name << ";\n"
+        << "}" << nl;
+
+    IOobject::writeDivider(os) << nl;
+}
+
+
+Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlock
+(
+    const label blocki,
+    Istream& is,
+    IOobject& headerIO
+)
+{
+    if (debug)
+    {
+        Pout<< "decomposedBlockData::readBlock:"
+            << " stream:" << is.name() << " attempt to read block " << blocki
+            << endl;
+    }
+
+    is.fatalCheck("read(Istream&)");
+
+    List<char> data;
+    autoPtr<ISstream> realIsPtr;
+
+    if (blocki == 0)
+    {
+        is >> data;
+        is.fatalCheck("read(Istream&) : reading entry");
+
+        string buf(data.begin(), data.size());
+        realIsPtr = new IStringStream(is.name(), buf);
+
+        // Read header
+        if (!headerIO.readHeader(realIsPtr()))
+        {
+            FatalIOErrorInFunction(realIsPtr())
+                << "problem while reading header for object "
+                << is.name() << exit(FatalIOError);
+        }
+    }
+    else
+    {
+        // Read master for header
+        is >> data;
+        is.fatalCheck("read(Istream&) : reading entry");
+
+        IOstream::versionNumber ver(IOstream::currentVersion);
+        IOstream::streamFormat fmt;
+        {
+            string buf(data.begin(), data.size());
+            IStringStream headerStream(is.name(), buf);
+
+            // Read header
+            if (!headerIO.readHeader(headerStream))
+            {
+                FatalIOErrorInFunction(headerStream)
+                    << "problem while reading header for object "
+                    << is.name() << exit(FatalIOError);
+            }
+            ver = headerStream.version();
+            fmt = headerStream.format();
+        }
+
+        for (label i = 1; i < blocki+1; i++)
+        {
+            // Read data, override old data
+            is >> data;
+            is.fatalCheck("read(Istream&) : reading entry");
+        }
+        string buf(data.begin(), data.size());
+        realIsPtr = new IStringStream(is.name(), buf);
+
+        // Apply master stream settings to realIsPtr
+        realIsPtr().format(fmt);
+        realIsPtr().version(ver);
+    }
+    return realIsPtr;
+}
+
+
+bool Foam::decomposedBlockData::readBlocks
+(
+    const label comm,
+    autoPtr<ISstream>& isPtr,
+    List<char>& data,
+    const UPstream::commsTypes commsType
+)
+{
+    if (debug)
+    {
+        Pout<< "decomposedBlockData::readBlocks:"
+            << " stream:" << (isPtr.valid() ? isPtr().name() : "invalid")
+            << " commsType:" << Pstream::commsTypeNames[commsType]
+            << " comm:" << comm << endl;
+    }
+
+    bool ok = false;
+
+    if (commsType == UPstream::commsTypes::scheduled)
+    {
+        if (UPstream::master(comm))
+        {
+            Istream& is = isPtr();
+            is.fatalCheck("read(Istream&)");
+
+            // Read master data
+            {
+                is >> data;
+                is.fatalCheck("read(Istream&) : reading entry");
+            }
+
+            // Read slave data
+            for
+            (
+                label proci = 1;
+                proci < UPstream::nProcs(comm);
+                proci++
+            )
+            {
+                List<char> elems(is);
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                OPstream os
+                (
+                    UPstream::commsTypes::scheduled,
+                    proci,
+                    0,
+                    UPstream::msgType(),
+                    comm
+                );
+                os << elems;
+            }
+
+            ok = is.good();
+        }
+        else
+        {
+            IPstream is
+            (
+                UPstream::commsTypes::scheduled,
+                UPstream::masterNo(),
+                0,
+                UPstream::msgType(),
+                comm
+            );
+            is >> data;
+        }
+    }
+    else
+    {
+        PstreamBuffers pBufs
+        (
+            UPstream::commsTypes::nonBlocking,
+            UPstream::msgType(),
+            comm
+        );
+
+        if (UPstream::master(comm))
+        {
+            Istream& is = isPtr();
+            is.fatalCheck("read(Istream&)");
+
+            // Read master data
+            {
+                is >> data;
+                is.fatalCheck("read(Istream&) : reading entry");
+            }
+
+            // Read slave data
+            for
+            (
+                label proci = 1;
+                proci < UPstream::nProcs(comm);
+                proci++
+            )
+            {
+                List<char> elems(is);
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                UOPstream os(proci, pBufs);
+                os << elems;
+            }
+        }
+
+        labelList recvSizes;
+        pBufs.finishedSends(recvSizes);
+
+        if (!UPstream::master(comm))
+        {
+            UIPstream is(UPstream::masterNo(), pBufs);
+            is >> data;
+        }
+    }
+
+    Pstream::scatter(ok, Pstream::msgType(), comm);
+
+    return ok;
+}
+
+
+Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
+(
+    const label comm,
+    const fileName& fName,
+    autoPtr<ISstream>& isPtr,
+    IOobject& headerIO,
+    const UPstream::commsTypes commsType
+)
+{
+    if (debug)
+    {
+        Pout<< "decomposedBlockData::readBlocks:"
+            << " stream:" << (isPtr.valid() ? isPtr().name() : "invalid")
+            << " commsType:" << Pstream::commsTypeNames[commsType] << endl;
+    }
+
+    bool ok = false;
+
+    List<char> data;
+    autoPtr<ISstream> realIsPtr;
+
+    if (commsType == UPstream::commsTypes::scheduled)
+    {
+        if (UPstream::master(comm))
+        {
+            Istream& is = isPtr();
+            is.fatalCheck("read(Istream&)");
+
+            // Read master data
+            {
+                is >> data;
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                string buf(data.begin(), data.size());
+                realIsPtr = new IStringStream(fName, buf);
+
+                // Read header
+                if (!headerIO.readHeader(realIsPtr()))
+                {
+                    FatalIOErrorInFunction(realIsPtr())
+                        << "problem while reading header for object "
+                        << is.name() << exit(FatalIOError);
+                }
+            }
+
+            // Read slave data
+            for
+            (
+                label proci = 1;
+                proci < UPstream::nProcs(comm);
+                proci++
+            )
+            {
+                is >> data;
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                OPstream os
+                (
+                    UPstream::commsTypes::scheduled,
+                    proci,
+                    0,
+                    UPstream::msgType(),
+                    comm
+                );
+                os << data;
+            }
+
+            ok = is.good();
+        }
+        else
+        {
+            IPstream is
+            (
+                UPstream::commsTypes::scheduled,
+                UPstream::masterNo(),
+                0,
+                UPstream::msgType(),
+                comm
+            );
+            is >> data;
+
+            string buf(data.begin(), data.size());
+            realIsPtr = new IStringStream(fName, buf);
+        }
+    }
+    else
+    {
+        PstreamBuffers pBufs
+        (
+            UPstream::commsTypes::nonBlocking,
+            UPstream::msgType(),
+            comm
+        );
+
+        if (UPstream::master(comm))
+        {
+            Istream& is = isPtr();
+            is.fatalCheck("read(Istream&)");
+
+            // Read master data
+            {
+                is >> data;
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                string buf(data.begin(), data.size());
+                realIsPtr = new IStringStream(fName, buf);
+
+                // Read header
+                if (!headerIO.readHeader(realIsPtr()))
+                {
+                    FatalIOErrorInFunction(realIsPtr())
+                        << "problem while reading header for object "
+                        << is.name() << exit(FatalIOError);
+                }
+            }
+
+            // Read slave data
+            for
+            (
+                label proci = 1;
+                proci < UPstream::nProcs(comm);
+                proci++
+            )
+            {
+                List<char> elems(is);
+                is.fatalCheck("read(Istream&) : reading entry");
+
+                UOPstream os(proci, pBufs);
+                os << elems;
+            }
+
+            ok = is.good();
+        }
+
+        labelList recvSizes;
+        pBufs.finishedSends(recvSizes);
+
+        if (!UPstream::master(comm))
+        {
+            UIPstream is(UPstream::masterNo(), pBufs);
+            is >> data;
+
+            string buf(data.begin(), data.size());
+            realIsPtr = new IStringStream(fName, buf);
+        }
+    }
+
+    Pstream::scatter(ok, Pstream::msgType(), comm);
+
+    // version
+    string versionString(realIsPtr().version().str());
+    Pstream::scatter(versionString,  Pstream::msgType(), comm);
+    realIsPtr().version(IStringStream(versionString)());
+
+    // stream
+    {
+        OStringStream os;
+        os << realIsPtr().format();
+        string formatString(os.str());
+        Pstream::scatter(formatString,  Pstream::msgType(), comm);
+        realIsPtr().format(formatString);
+    }
+
+    word name(headerIO.name());
+    Pstream::scatter(name, Pstream::msgType(), comm);
+    headerIO.rename(name);
+    Pstream::scatter(headerIO.headerClassName(), Pstream::msgType(), comm);
+    Pstream::scatter(headerIO.note(), Pstream::msgType(), comm);
+    //Pstream::scatter(headerIO.instance(), Pstream::msgType(), comm);
+    //Pstream::scatter(headerIO.local(), Pstream::msgType(), comm);
+
+    return realIsPtr;
+}
+
+
+bool Foam::decomposedBlockData::writeBlocks
+(
+    const label comm,
+    autoPtr<OSstream>& osPtr,
+    List<std::streamoff>& start,
+    const UList<char>& data,
+    const UPstream::commsTypes commsType,
+    const bool syncReturnState
+)
+{
+    if (debug)
+    {
+        Pout<< "decomposedBlockData::writeBlocks:"
+            << " stream:" << (osPtr.valid() ? osPtr().name() : "invalid")
+            << " data:" << data.size()
+            << " commsType:" << Pstream::commsTypeNames[commsType] << endl;
+    }
+
+    bool ok = true;
+
+    labelList recvSizes(Pstream::nProcs(comm));
+    recvSizes[Pstream::myProcNo(comm)] = data.byteSize();
+    Pstream::gatherList(recvSizes, Pstream::msgType(), comm);
+
+    if (commsType == UPstream::commsTypes::scheduled)
+    {
+        if (UPstream::master(comm))
+        {
+            start.setSize(UPstream::nProcs(comm));
+
+            OSstream& os = osPtr();
+
+            // Write master data
+            {
+                os << nl << "// Processor" << UPstream::masterNo() << nl;
+                start[UPstream::masterNo()] = os.stdStream().tellp();
+                os << data;
+            }
+            // Write slaves
+            List<char> elems;
+            for (label proci = 1; proci < UPstream::nProcs(comm); proci++)
+            {
+                elems.setSize(recvSizes[proci]);
+                IPstream::read
+                (
+                    UPstream::commsTypes::scheduled,
+                    proci,
+                    elems.begin(),
+                    elems.size(),
+                    Pstream::msgType(),
+                    comm
+                );
+
+                os << nl << nl << "// Processor" << proci << nl;
+                start[proci] = os.stdStream().tellp();
+                os << elems;
+            }
+
+            ok = os.good();
+        }
+        else
+        {
+            UOPstream::write
+            (
+                UPstream::commsTypes::scheduled,
+                UPstream::masterNo(),
+                data.begin(),
+                data.byteSize(),
+                Pstream::msgType(),
+                comm
+            );
+        }
+    }
+    else
+    {
+        if (debug)
+        {
+            struct timeval tv;
+            gettimeofday(&tv, nullptr);
+            Pout<< "Starting sending at:"
+                << 1.0*tv.tv_sec+tv.tv_usec/1e6 << " s"
+                << Foam::endl;
+        }
+
+
+        label startOfRequests = Pstream::nRequests();
+
+        if (!UPstream::master(comm))
+        {
+            UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                UPstream::masterNo(),
+                data.begin(),
+                data.byteSize(),
+                Pstream::msgType(),
+                comm
+            );
+            Pstream::waitRequests(startOfRequests);
+        }
+        else
+        {
+            List<List<char>> recvBufs(Pstream::nProcs(comm));
+            for (label proci = 1; proci < UPstream::nProcs(comm); proci++)
+            {
+                recvBufs[proci].setSize(recvSizes[proci]);
+                UIPstream::read
+                (
+                    UPstream::commsTypes::nonBlocking,
+                    proci,
+                    recvBufs[proci].begin(),
+                    recvSizes[proci],
+                    Pstream::msgType(),
+                    comm
+                );
+            }
+
+            if (debug)
+            {
+                struct timeval tv;
+                gettimeofday(&tv, nullptr);
+                Pout<< "Starting master-only writing at:"
+                    << 1.0*tv.tv_sec+tv.tv_usec/1e6 << " s"
+                    << Foam::endl;
+            }
+
+            start.setSize(UPstream::nProcs(comm));
+
+            OSstream& os = osPtr();
+
+            // Write master data
+            {
+                os << nl << "// Processor" << UPstream::masterNo() << nl;
+                start[UPstream::masterNo()] = os.stdStream().tellp();
+                os << data;
+            }
+
+            if (debug)
+            {
+                struct timeval tv;
+                gettimeofday(&tv, nullptr);
+                Pout<< "Starting slave writing at:"
+                    << 1.0*tv.tv_sec+tv.tv_usec/1e6 << " s"
+                    << Foam::endl;
+            }
+
+            // Write slaves
+            for (label proci = 1; proci < UPstream::nProcs(comm); proci++)
+            {
+                os << nl << nl << "// Processor" << proci << nl;
+                start[proci] = os.stdStream().tellp();
+
+                if (Pstream::finishedRequest(startOfRequests+proci-1))
+                {
+                    os << recvBufs[proci];
+                }
+            }
+
+            Pstream::resetRequests(startOfRequests);
+
+            ok = os.good();
+        }
+    }
+    if (debug)
+    {
+        struct timeval tv;
+        gettimeofday(&tv, nullptr);
+        Pout<< "Finished master-only writing at:"
+            << 1.0*tv.tv_sec+tv.tv_usec/1e6 << " s"
+            << Foam::endl;
+    }
+
+    if (syncReturnState)
+    {
+        //- Enable to get synchronised error checking. Is the one that keeps
+        //  slaves as slow as the master (which does all the writing)
+        Pstream::scatter(ok, Pstream::msgType(), comm);
+    }
+
+    return ok;
+}
+
+
+bool Foam::decomposedBlockData::read()
+{
+    autoPtr<ISstream> isPtr;
+    fileName objPath(fileHandler().filePath(false, *this, word::null));
+    if (UPstream::master(comm_))
+    {
+        isPtr.reset(new IFstream(objPath));
+        IOobject::readHeader(isPtr());
+    }
+
+    List<char>& data = *this;
+    return readBlocks(comm_, isPtr, data, commsType_);
+}
+
+
+bool Foam::decomposedBlockData::writeData(Ostream& os) const
+{
+    const List<char>& data = *this;
+
+    string str
+    (
+        reinterpret_cast<const char*>(data.cbegin()),
+        data.byteSize()
+    );
+
+    IOobject io(*this);
+    if (Pstream::master())
+    {
+        IStringStream is(name(), str);
+        io.readHeader(is);
+    }
+
+    // Scatter header information
+
+    // version
+    string versionString(os.version().str());
+    Pstream::scatter(versionString);
+
+    // stream
+    string formatString;
+    {
+        OStringStream os;
+        os << os.format();
+        formatString  = os.str();
+        Pstream::scatter(formatString);
+    }
+
+    //word masterName(name());
+    //Pstream::scatter(masterName);
+
+    Pstream::scatter(io.headerClassName());
+    Pstream::scatter(io.note());
+    //Pstream::scatter(io.instance(), Pstream::msgType(), comm);
+    //Pstream::scatter(io.local(), Pstream::msgType(), comm);
+
+    fileName masterLocation(instance()/db().dbDir()/local());
+    Pstream::scatter(masterLocation);
+
+    if (!Pstream::master())
+    {
+        writeHeader
+        (
+            os,
+            IOstream::versionNumber(IStringStream(versionString)()),
+            IOstream::formatEnum(formatString),
+            io.headerClassName(),
+            io.note(),
+            masterLocation,
+            name()
+        );
+    }
+
+    os.writeQuoted(str, false);
+
+    if (!Pstream::master())
+    {
+        IOobject::writeEndDivider(os);
+    }
+
+    return os.good();
+}
+
+
+bool Foam::decomposedBlockData::writeObject
+(
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    autoPtr<OSstream> osPtr;
+    if (UPstream::master(comm_))
+    {
+        // Note: always write binary. These are strings so readable
+        //       anyway. They have already be tokenised on the sending side.
+        osPtr.reset(new OFstream(objectPath(), IOstream::BINARY, ver, cmp));
+        IOobject::writeHeader(osPtr());
+    }
+    List<std::streamoff> start;
+    return writeBlocks(comm_, osPtr, start, *this, commsType_);
+}
+
+
+Foam::label Foam::decomposedBlockData::numBlocks(const fileName& fName)
+{
+    label nBlocks = 0;
+
+    IFstream is(fName);
+    is.fatalCheck("decomposedBlockData::numBlocks(const fileName&)");
+
+    if (!is.good())
+    {
+        return nBlocks;
+    }
+
+    // Skip header
+    token firstToken(is);
+
+    if
+    (
+        is.good()
+     && firstToken.isWord()
+     && firstToken.wordToken() == "FoamFile"
+    )
+    {
+        dictionary headerDict(is);
+        is.version(headerDict.lookup("version"));
+        is.format(headerDict.lookup("format"));
+    }
+
+    List<char> data;
+    while (is.good())
+    {
+        token sizeToken(is);
+        if (!sizeToken.isLabel())
+        {
+            return nBlocks;
+        }
+        is.putBack(sizeToken);
+
+        is >> data;
+        nBlocks++;
+    }
+
+    return nBlocks;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
new file mode 100644
index 000000000..dc4e3d70f
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::decomposedBlockData
+
+Description
+    decomposedBlockData is a List<char> with IO on the master processor only.
+
+SourceFiles
+    decomposedBlockData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef decomposedBlockData_H
+#define decomposedBlockData_H
+
+#include "IOList.H"
+#include "regIOobject.H"
+#include "UPstream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class decomposedBlockData Declaration
+\*---------------------------------------------------------------------------*/
+
+class decomposedBlockData
+:
+    public regIOobject,
+    public List<char>
+{
+protected:
+
+    // Protected data
+
+        //- Type to use for gather
+        const UPstream::commsTypes commsType_;
+
+        //- Communicator for all parallel comms
+        const label comm_;
+
+
+    // Protected member functions
+
+        //- Read data into *this. ISstream is only valid on master.
+        static bool readBlocks
+        (
+            const label comm,
+            autoPtr<ISstream>& isPtr,
+            List<char>& data,
+            const UPstream::commsTypes commsType
+        );
+
+
+public:
+
+    TypeName("decomposedBlockData");
+
+
+    // Constructors
+
+        //- Construct given an IOobject
+        decomposedBlockData
+        (
+            const label comm,
+            const IOobject&,
+            const UPstream::commsTypes = UPstream::commsTypes::scheduled
+        );
+
+        //- Construct given an IOobject and for READ_IF_MODIFIED a List<char>
+        decomposedBlockData
+        (
+            const label comm,
+            const IOobject&,
+            const UList<char>&,
+            const UPstream::commsTypes = UPstream::commsTypes::scheduled
+        );
+
+        //- Construct by transferring the IOList contents
+        decomposedBlockData
+        (
+            const label comm,
+            const IOobject&,
+            const Xfer<List<char>>&,
+            const UPstream::commsTypes = UPstream::commsTypes::scheduled
+        );
+
+
+    //- Destructor
+    virtual ~decomposedBlockData();
+
+
+    // Member functions
+
+        //- Read object
+        virtual bool read();
+
+        //- Write separated content. Assumes content is the serialised data
+        //  and that the master data contains a header
+        virtual bool writeData(Ostream&) const;
+
+        //- Write using given format, version and compression
+        virtual bool writeObject
+        (
+            IOstream::streamFormat,
+            IOstream::versionNumber,
+            IOstream::compressionType,
+            const bool valid
+        ) const;
+
+
+    // Helpers
+
+        //- Read header. Call only on master.
+        static bool readMasterHeader(IOobject&, Istream&);
+
+        //- Helper: write FoamFile IOobject header
+        static void writeHeader
+        (
+            Ostream& os,
+            const IOstream::versionNumber version,
+            const IOstream::streamFormat format,
+            const word& type,
+            const string& note,
+            const fileName& location,
+            const word& name
+        );
+
+        //- Read selected block (non-seeking) + header information
+        static autoPtr<ISstream> readBlock
+        (
+            const label blocki,
+            Istream& is,
+            IOobject& headerIO
+        );
+
+        //- Read master header information (into headerIO) and return
+        //  data in stream. Note: isPtr is only valid on master.
+        static autoPtr<ISstream> readBlocks
+        (
+            const label comm,
+            const fileName& fName,
+            autoPtr<ISstream>& isPtr,
+            IOobject& headerIO,
+            const UPstream::commsTypes commsType
+        );
+
+        //- Write *this. Ostream only valid on master. Returns starts of
+        //  processor blocks
+        static bool writeBlocks
+        (
+            const label comm,
+            autoPtr<OSstream>& osPtr,
+            List<std::streamoff>& start,
+            const UList<char>&,
+            const UPstream::commsTypes,
+            const bool syncReturnState = true
+        );
+
+        //- Detect number of blocks in a file
+        static label numBlocks(const fileName&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 6e4ca2d05..9daafa825 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,8 @@ namespace Foam
 Foam::OFstreamAllocator::OFstreamAllocator
 (
     const fileName& pathname,
-    IOstream::compressionType compression
+    IOstream::compressionType compression,
+    const bool append
 )
 :
     ofPtr_(nullptr)
@@ -52,26 +53,48 @@ Foam::OFstreamAllocator::OFstreamAllocator
             InfoInFunction << "Cannot open null file " << endl;
         }
     }
+    ofstream::openmode mode(ofstream::out);
+    if (append)
+    {
+        mode |= ofstream::app;
+    }
 
     if (compression == IOstream::COMPRESSED)
     {
-        // get identically named uncompressed version out of the way
-        if (isFile(pathname, false))
+        // Get identically named uncompressed version out of the way
+        fileName::Type pathType = Foam::type(pathname, false);
+        if (pathType == fileName::FILE || pathType == fileName::LINK)
         {
             rm(pathname);
         }
+        fileName gzPathName(pathname + ".gz");
 
-        ofPtr_ = new ogzstream((pathname + ".gz").c_str());
+        if (!append && Foam::type(gzPathName) == fileName::LINK)
+        {
+            // Disallow writing into softlink to avoid any problems with
+            // e.g. softlinked initial fields
+            rm(gzPathName);
+        }
+
+        ofPtr_ = new ogzstream(gzPathName.c_str(), mode);
     }
     else
     {
         // get identically named compressed version out of the way
-        if (isFile(pathname + ".gz", false))
+        fileName gzPathName(pathname + ".gz");
+        fileName::Type gzType = Foam::type(gzPathName, false);
+        if (gzType == fileName::FILE || gzType == fileName::LINK)
         {
-            rm(pathname + ".gz");
+            rm(gzPathName);
+        }
+        if (!append && Foam::type(pathname, false) == fileName::LINK)
+        {
+            // Disallow writing into softlink to avoid any problems with
+            // e.g. softlinked initial fields
+            rm(pathname);
         }
 
-        ofPtr_ = new ofstream(pathname.c_str());
+        ofPtr_ = new ofstream(pathname.c_str(), mode);
     }
 }
 
@@ -89,10 +112,11 @@ Foam::OFstream::OFstream
     const fileName& pathname,
     streamFormat format,
     versionNumber version,
-    compressionType compression
+    compressionType compression,
+    const bool append
 )
 :
-    OFstreamAllocator(pathname, compression),
+    OFstreamAllocator(pathname, compression, append),
     OSstream(*ofPtr_, "OFstream.sinkFile_", format, version, compression),
     pathname_(pathname)
 {
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index 2350e3f39..c273ed69a 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.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-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,8 @@ class OFstreamAllocator
         OFstreamAllocator
         (
             const fileName& pathname,
-            IOstream::compressionType compression=IOstream::UNCOMPRESSED
+            IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+            const bool append = false
         );
 
     //- Destructor
@@ -103,7 +104,8 @@ public:
             const fileName& pathname,
             streamFormat format=ASCII,
             versionNumber version=currentVersion,
-            compressionType compression=UNCOMPRESSED
+            compressionType compression=UNCOMPRESSED,
+            const bool append = false
         );
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
new file mode 100644
index 000000000..1a43ebcd3
--- /dev/null
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "masterOFstream.H"
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "PstreamBuffers.H"
+#include "masterUncollatedFileOperation.H"
+#include "boolList.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::masterOFstream::write
+(
+    const fileName& fName,
+    const string& str
+)
+{
+    mkDir(fName.path());
+
+    OFstream os
+    (
+        fName,
+        IOstream::BINARY,   //format(),
+        version(),
+        compression_,
+        append_
+    );
+    if (!os.good())
+    {
+        FatalIOErrorInFunction(os)
+            << "Could not open file " << fName
+            << exit(FatalIOError);
+    }
+
+    os.writeQuoted(str, false);
+    if (!os.good())
+    {
+        FatalIOErrorInFunction(os)
+            << "Failed writing to " << fName
+            << exit(FatalIOError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::masterOFstream::masterOFstream
+(
+    const fileName& pathName,
+    streamFormat format,
+    versionNumber version,
+    compressionType compression,
+    const bool append,
+    const bool valid
+)
+:
+    OStringStream(format, version),
+    pathName_(pathName),
+    compression_(compression),
+    append_(append),
+    valid_(valid)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::masterOFstream::~masterOFstream()
+{
+    if (Pstream::parRun())
+    {
+        List<fileName> filePaths(Pstream::nProcs());
+        filePaths[Pstream::myProcNo()] = pathName_;
+        Pstream::gatherList(filePaths);
+
+        bool uniform =
+            fileOperations::masterUncollatedFileOperation::uniformFile
+            (
+                filePaths
+            );
+
+        Pstream::scatter(uniform);
+
+        if (uniform)
+        {
+            if (Pstream::master() && valid_)
+            {
+                write(pathName_, str());
+            }
+            return;
+        }
+        boolList valid(Pstream::nProcs());
+        valid[Pstream::myProcNo()] = valid_;
+        Pstream::gatherList(valid);
+
+
+        // Different files
+        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+
+        // Send my buffer to master
+        if (!Pstream::master())
+        {
+            UOPstream os(Pstream::masterNo(), pBufs);
+            string s(this->str());
+            os.write(&s[0], s.size());
+        }
+
+        labelList recvSizes;
+        pBufs.finishedSends(recvSizes);
+
+        if (Pstream::master())
+        {
+            // Write my own data
+            {
+                if (valid[Pstream::myProcNo()])
+                {
+                    write(filePaths[Pstream::myProcNo()], str());
+                }
+            }
+
+            for (label proci = 1; proci < Pstream::nProcs(); proci++)
+            {
+                UIPstream is(proci, pBufs);
+                List<char> buf(recvSizes[proci]);
+
+                is.read(buf.begin(), buf.size());
+
+                if (valid[proci])
+                {
+                    write(filePaths[proci], string(buf.begin(), buf.size()));
+                }
+            }
+        }
+    }
+    else
+    {
+        write(pathName_, str());
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
new file mode 100644
index 000000000..575a115e7
--- /dev/null
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::masterOFstream
+
+Description
+    Master-only drop-in replacement for OFstream.
+
+SourceFiles
+    masterOFstream.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef masterOFstream_H
+#define masterOFstream_H
+
+#include "OStringStream.H"
+//#include "tmpNrc.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class masterOFstream Declaration
+\*---------------------------------------------------------------------------*/
+
+class masterOFstream
+:
+    public OStringStream
+{
+    // Private data
+
+        const fileName pathName_;
+
+        const IOstream::compressionType compression_;
+
+        const bool append_;
+
+        //- Should file be written
+        const bool valid_;
+
+
+    // Private Member Functions
+
+        //- Open file with checking
+        void write(const fileName& fName, const string& str);
+
+
+public:
+
+    // Constructors
+
+        //- Construct and set stream status
+        masterOFstream
+        (
+            const fileName& pathname,
+            streamFormat format=ASCII,
+            versionNumber version=currentVersion,
+            compressionType compression=UNCOMPRESSED,
+            const bool append = false,
+            const bool valid = true
+        );
+
+
+    //- Destructor
+    ~masterOFstream();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index 5bf068b81..9947b249e 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.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-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,6 +74,25 @@ public:
         {}
 
 
+        //- Construct from string and name
+        IStringStream
+        (
+            const string& name,
+            const string& buffer,
+            streamFormat format=ASCII,
+            versionNumber version=currentVersion
+        )
+        :
+            ISstream
+            (
+                *(new std::istringstream(buffer)),
+                name,
+                format,
+                version
+            )
+        {}
+
+
         //- Construct from char*
         IStringStream
         (
diff --git a/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H b/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
new file mode 100644
index 000000000..a774271a1
--- /dev/null
+++ b/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::dummyISstream
+
+Description
+    Dummy stream for input. Aborts at any attempt to read from it.
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dummyISstream_H
+#define dummyISstream_H
+
+#include "IStringStream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class dummyISstream Declaration
+\*---------------------------------------------------------------------------*/
+
+class dummyISstream
+:
+    public IStringStream
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        dummyISstream()
+        :
+            IStringStream(string::null)
+        {}
+
+
+    //- Destructor
+    virtual ~dummyISstream()
+    {}
+
+
+    // Member functions
+
+        // Read functions
+
+            //- Return next token from stream
+            virtual Istream& read(token&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a character
+            virtual Istream& read(char&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a word
+            virtual Istream& read(word&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            // Read a string (including enclosing double-quotes)
+            virtual Istream& read(string&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a label
+            virtual Istream& read(label&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a floatScalar
+            virtual Istream& read(floatScalar&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a doubleScalar
+            virtual Istream& read(doubleScalar&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read binary block
+            virtual Istream& read(char*, std::streamsize)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Rewind and return the stream so that it may be read again
+            virtual Istream& rewind()
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Return flags of stream
+            virtual ios_base::fmtflags flags() const
+            {
+                NotImplemented;
+                return ios_base::fmtflags(0);
+            }
+
+            //- Set flags of stream
+            virtual ios_base::fmtflags flags(const ios_base::fmtflags f)
+            {
+                NotImplemented;
+                return f;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/dummyIstream/dummyIstream.H b/src/OpenFOAM/db/IOstreams/dummyIstream/dummyIstream.H
new file mode 100644
index 000000000..9e8549820
--- /dev/null
+++ b/src/OpenFOAM/db/IOstreams/dummyIstream/dummyIstream.H
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::dummyIstream
+
+Description
+    Dummy stream for input. Aborts at any attempt to read from it.
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dummyIstream_H
+#define dummyIstream_H
+
+#include "Istream.H"
+//#include <sstream>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class dummyIstream Declaration
+\*---------------------------------------------------------------------------*/
+
+class dummyIstream
+:
+    public Istream
+{
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        dummyIstream()
+        :
+            Istream()
+        {}
+
+
+    //- Destructor
+    ~dummyIstream()
+    {}
+
+
+    // Member functions
+
+        // Read functions
+
+            //- Return next token from stream
+            virtual Istream& read(token&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a character
+            virtual Istream& read(char&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a word
+            virtual Istream& read(word&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            // Read a string (including enclosing double-quotes)
+            virtual Istream& read(string&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a label
+            virtual Istream& read(label&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a floatScalar
+            virtual Istream& read(floatScalar&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read a doubleScalar
+            virtual Istream& read(doubleScalar&)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Read binary block
+            virtual Istream& read(char*, std::streamsize)
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Rewind and return the stream so that it may be read again
+            virtual Istream& rewind()
+            {
+                NotImplemented;
+                return *this;
+            }
+
+            //- Return flags of stream
+            virtual ios_base::fmtflags flags() const
+            {
+                NotImplemented;
+                return ios_base::fmtflags(0);
+            }
+
+            //- Set flags of stream
+            virtual ios_base::fmtflags flags(const ios_base::fmtflags f)
+            {
+                NotImplemented;
+                return f;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 5738f5f4d..62f04d90c 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -26,6 +26,7 @@ License
 #include "Time.H"
 #include "PstreamReduceOps.H"
 #include "argList.H"
+#include "IOdictionary.H"
 
 #include <sstream>
 
@@ -179,13 +180,12 @@ void Foam::Time::setControls()
 
     // Check if time directory exists
     // If not increase time precision to see if it is formatted differently.
-    if (!exists(timePath(), false))
+    if (!fileHandler().exists(timePath(), false))
     {
         int oldPrecision = precision_;
         int requiredPrecision = -1;
         bool found = false;
         word oldTime(timeName());
-
         for
         (
             precision_ = maxPrecision_;
@@ -196,7 +196,6 @@ void Foam::Time::setControls()
             // Update the time formatting
             setTime(startTime_, 0);
 
-            // Check that the time name has changed otherwise exit loop
             word newTime(timeName());
             if (newTime == oldTime)
             {
@@ -205,7 +204,7 @@ void Foam::Time::setControls()
             oldTime = newTime;
 
             // Check the existence of the time directory with the new format
-            found = exists(timePath(), false);
+            found = fileHandler().exists(timePath(), false);
 
             if (found)
             {
@@ -397,28 +396,12 @@ Foam::Time::Time
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
     if (runTimeModifiable_)
     {
-        monitorPtr_.reset
-        (
-            new fileMonitor
-            (
-                regIOobject::fileModificationChecking == inotify
-             || regIOobject::fileModificationChecking == inotifyMaster
-            )
-        );
-
-        // File might not exist yet.
-        fileName f(controlDict_.filePath());
-
-        if (!f.size())
-        {
-            // We don't have this file but would like to re-read it.
-            // Possibly if in master-only reading mode. Use a non-existing
-            // file to keep fileMonitor synced.
-            f = controlDict_.objectPath();
-        }
-
-        controlDict_.watchIndex() = addWatch(f);
+        // Monitor all files that controlDict depends on
+        fileHandler().addWatches(controlDict_, controlDict_.files());
     }
+
+    // Clear dependent files
+    controlDict_.files().clear();
 }
 
 
@@ -495,28 +478,12 @@ Foam::Time::Time
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
     if (runTimeModifiable_)
     {
-        monitorPtr_.reset
-        (
-            new fileMonitor
-            (
-                regIOobject::fileModificationChecking == inotify
-             || regIOobject::fileModificationChecking == inotifyMaster
-            )
-        );
-
-        // File might not exist yet.
-        fileName f(controlDict_.filePath());
-
-        if (!f.size())
-        {
-            // We don't have this file but would like to re-read it.
-            // Possibly if in master-only reading mode. Use a non-existing
-            // file to keep fileMonitor synced.
-            f = controlDict_.objectPath();
-        }
-
-        controlDict_.watchIndex() = addWatch(f);
+        // Monitor all files that controlDict depends on
+        fileHandler().addWatches(controlDict_, controlDict_.files());
     }
+
+    // Clear dependent files since not needed
+    controlDict_.files().clear();
 }
 
 
@@ -592,28 +559,12 @@ Foam::Time::Time
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
     if (runTimeModifiable_)
     {
-        monitorPtr_.reset
-        (
-            new fileMonitor
-            (
-                regIOobject::fileModificationChecking == inotify
-             || regIOobject::fileModificationChecking == inotifyMaster
-            )
-        );
-
-        // File might not exist yet.
-        fileName f(controlDict_.filePath());
-
-        if (!f.size())
-        {
-            // We don't have this file but would like to re-read it.
-            // Possibly if in master-only reading mode. Use a non-existing
-            // file to keep fileMonitor synced.
-            f = controlDict_.objectPath();
-        }
-
-        controlDict_.watchIndex() = addWatch(f);
+        // Monitor all files that controlDict depends on
+        fileHandler().addWatches(controlDict_, controlDict_.files());
     }
+
+    // Clear dependent files since not needed
+    controlDict_.files().clear();
 }
 
 
@@ -678,9 +629,9 @@ Foam::Time::Time
 
 Foam::Time::~Time()
 {
-    if (controlDict_.watchIndex() != -1)
+    forAllReverse(controlDict_.watchIndices(), i)
     {
-        removeWatch(controlDict_.watchIndex());
+        fileHandler().removeWatch(controlDict_.watchIndices()[i]);
     }
 
     // Destroy function objects first
@@ -690,38 +641,6 @@ Foam::Time::~Time()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::Time::addWatch(const fileName& fName) const
-{
-    return monitorPtr_().addWatch(fName);
-}
-
-
-bool Foam::Time::removeWatch(const label watchIndex) const
-{
-    return monitorPtr_().removeWatch(watchIndex);
-}
-
-const Foam::fileName& Foam::Time::getFile(const label watchIndex) const
-{
-    return monitorPtr_().getFile(watchIndex);
-}
-
-
-Foam::fileMonitor::fileState Foam::Time::getState
-(
-    const label watchFd
-) const
-{
-    return monitorPtr_().getState(watchFd);
-}
-
-
-void Foam::Time::setUnmodified(const label watchFd) const
-{
-    monitorPtr_().setUnmodified(watchFd);
-}
-
-
 Foam::word Foam::Time::timeName(const scalar t, const int precision)
 {
     std::ostringstream buf;
@@ -744,29 +663,28 @@ Foam::instantList Foam::Time::times() const
 }
 
 
-Foam::word Foam::Time::findInstancePath(const instant& t) const
+Foam::word Foam::Time::findInstancePath
+(
+    const fileName& directory,
+    const instant& t
+) const
 {
-    const fileName directory = path();
-    const word& constantName = constant();
+    // Simplified version: use findTimes (readDir + sort). The expensive
+    // bit is the readDir, not the sorting. Tbd: avoid calling findInstancePath
+    // from filePath.
 
-    // Read directory entries into a list
-    fileNameList dirEntries(readDir(directory, fileName::DIRECTORY));
+    instantList timeDirs = findTimes(path(), constant());
+    // Note:
+    // - times will include constant (with value 0) as first element.
+    //   For backwards compatibility make sure to find 0 in preference
+    //   to constant.
+    // - list is sorted so could use binary search
 
-    forAll(dirEntries, i)
+    forAllReverse(timeDirs, i)
     {
-        scalar timeValue;
-        if (readScalar(dirEntries[i].c_str(), timeValue) && t.equal(timeValue))
+        if (t.equal(timeDirs[i].value()))
         {
-            return dirEntries[i];
-        }
-    }
-
-    if (t.equal(0.0))
-    {
-        // Looking for 0 or constant. 0 already checked above.
-        if (isDir(directory/constantName))
-        {
-            return constantName;
+            return timeDirs[i].name();
         }
     }
 
@@ -774,6 +692,12 @@ Foam::word Foam::Time::findInstancePath(const instant& t) const
 }
 
 
+Foam::word Foam::Time::findInstancePath(const instant& t) const
+{
+    return findInstancePath(path(), t);
+}
+
+
 Foam::instant Foam::Time::findClosestTime(const scalar t) const
 {
     instantList timeDirs = findTimes(path(), constant());
@@ -934,6 +858,7 @@ void Foam::Time::setTime(const Time& t)
     value() = t.value();
     dimensionedScalar::name() = t.dimensionedScalar::name();
     timeIndex_ = t.timeIndex_;
+    fileHandler().setTime(*this);
 }
 
 
@@ -960,6 +885,7 @@ void Foam::Time::setTime(const instant& inst, const label newIndex)
     timeDict.readIfPresent("deltaT", deltaT_);
     timeDict.readIfPresent("deltaT0", deltaT0_);
     timeDict.readIfPresent("index", timeIndex_);
+    fileHandler().setTime(*this);
 }
 
 
@@ -974,6 +900,7 @@ void Foam::Time::setTime(const scalar newTime, const label newIndex)
     value() = newTime;
     dimensionedScalar::name() = timeName(timeToUserTime(newTime));
     timeIndex_ = newIndex;
+    fileHandler().setTime(*this);
 }
 
 
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 7cf79dec3..9a6fae14e 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "TimePaths.H"
 #include "objectRegistry.H"
-#include "IOdictionary.H"
+#include "unwatchedIOdictionary.H"
 #include "FIFOStack.H"
 #include "clock.H"
 #include "cpuTime.H"
@@ -51,7 +51,6 @@ SourceFiles
 #include "typeInfo.H"
 #include "dlLibraryTable.H"
 #include "functionObjectList.H"
-#include "fileMonitor.H"
 #include "sigWriteNow.H"
 #include "sigStopAtWriteNow.H"
 
@@ -77,16 +76,12 @@ class Time
 {
     // Private data
 
-        //- file-change monitor for all registered files
-        mutable autoPtr<fileMonitor> monitorPtr_;
-
         //- Any loaded dynamic libraries. Make sure to construct before
         //  reading controlDict.
         dlLibraryTable libs_;
 
         //- The controlDict
-        IOdictionary controlDict_;
-
+        unwatchedIOdictionary controlDict_;
 
 public:
 
@@ -174,6 +169,9 @@ protected:
         //- Read the control dictionary and set the write controls etc.
         virtual void readDict();
 
+        //- Find IOobject in the objectPath
+        static bool exists(IOobject&);
+
 
 private:
 
@@ -323,26 +321,8 @@ public:
             //- Read control dictionary, update controls and time
             virtual bool read();
 
-            // Automatic rereading
-
-                //- Read the objects that have been modified
-                void readModifiedObjects();
-
-                //- Add watching of a file. Returns handle
-                label addWatch(const fileName&) const;
-
-                //- Remove watch on a file (using handle)
-                bool removeWatch(const label) const;
-
-                //- Get name of file being watched (using handle)
-                const fileName& getFile(const label) const;
-
-                //- Get current state of file (using handle)
-                fileMonitor::fileState getState(const label) const;
-
-                //- Set current state of file (using handle) to unmodified
-                void setUnmodified(const label) const;
-
+            //- Read the objects that have been modified
+            void readModifiedObjects();
 
             //- Return the location of "dir" containing the file "name".
             //  (eg, used in reading mesh data)
@@ -359,6 +339,10 @@ public:
             //- Search the case for valid time directories
             instantList times() const;
 
+            //- Search the case for the time directory path
+            //  corresponding to the given instance
+            word findInstancePath(const fileName& path, const instant&) const;
+
             //- Search the case for the time directory path
             //  corresponding to the given instance
             word findInstancePath(const instant&) const;
@@ -382,7 +366,8 @@ public:
             (
                 IOstream::streamFormat,
                 IOstream::versionNumber,
-                IOstream::compressionType
+                IOstream::compressionType,
+                const bool valid
             ) const;
 
             //- Write the objects now (not at end of iteration) and continue
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 39e88a66d..44083fc2d 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -27,6 +27,8 @@ License
 #include "Pstream.H"
 #include "simpleObjectRegistry.H"
 #include "dimensionedConstants.H"
+#include "IOdictionary.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -126,6 +128,43 @@ void Foam::Time::readDict()
                 }
             }
         }
+
+
+        // Handle fileHandler override explicitly since interacts with
+        // local dictionary monitoring.
+        word fileHandlerName;
+        if
+        (
+            localSettings.readIfPresent("fileHandler", fileHandlerName)
+         && fileHandler().type() != fileHandlerName
+        )
+        {
+            // Remove the old watches since destroying the file
+            fileNameList oldWatchedFiles(controlDict_.watchIndices());
+            forAllReverse(controlDict_.watchIndices(), i)
+            {
+                label watchi = controlDict_.watchIndices()[i];
+                oldWatchedFiles[i] = fileHandler().getFile(watchi);
+                fileHandler().removeWatch(watchi);
+            }
+            controlDict_.watchIndices().clear();
+
+            // Installing the new handler
+            Info<< "Overriding fileHandler to " << fileHandlerName << endl;
+
+            autoPtr<fileOperation> handler
+            (
+                fileOperation::New
+                (
+                    fileHandlerName,
+                    true
+                )
+            );
+            Foam::fileHandler(handler);
+
+            // Reinstall old watches
+            fileHandler().addWatches(controlDict_, oldWatchedFiles);
+        }
     }
 
 
@@ -366,10 +405,16 @@ void Foam::Time::readDict()
     controlDict_.readIfPresent("graphFormat", graphFormat_);
     controlDict_.readIfPresent("runTimeModifiable", runTimeModifiable_);
 
-    if (!runTimeModifiable_ && controlDict_.watchIndex() != -1)
+
+
+
+    if (!runTimeModifiable_ && controlDict_.watchIndices().size())
     {
-        removeWatch(controlDict_.watchIndex());
-        controlDict_.watchIndex() = -1;
+        forAllReverse(controlDict_.watchIndices(), i)
+        {
+            fileHandler().removeWatch(controlDict_.watchIndices()[i]);
+        }
+        controlDict_.watchIndices().clear();
     }
 }
 
@@ -379,6 +424,17 @@ bool Foam::Time::read()
     if (controlDict_.regIOobject::read())
     {
         readDict();
+
+        if (runTimeModifiable_)
+        {
+            // For IOdictionary the call to regIOobject::read() would have
+            // already updated all the watchIndices via the addWatch but
+            // controlDict_ is an unwatchedIOdictionary so will only have
+            // stored the dependencies as files.
+            fileHandler().addWatches(controlDict_, controlDict_.files());
+        }
+        controlDict_.files().clear();
+
         return true;
     }
     else
@@ -396,7 +452,7 @@ void Foam::Time::readModifiedObjects()
         // valid filePath).
         // Note: requires same ordering in objectRegistries on different
         // processors!
-        monitorPtr_().updateStates
+        fileHandler().updateStates
         (
             (
                 regIOobject::fileModificationChecking == inotifyMaster
@@ -412,6 +468,17 @@ void Foam::Time::readModifiedObjects()
         {
             readDict();
             functionObjects_.read();
+
+            if (runTimeModifiable_)
+            {
+                // For IOdictionary the call to regIOobject::read() would have
+                // already updated all the watchIndices via the addWatch but
+                // controlDict_ is an unwatchedIOdictionary so will only have
+                // stored the dependencies as files.
+
+                fileHandler().addWatches(controlDict_, controlDict_.files());
+            }
+            controlDict_.files().clear();
         }
 
         bool registryModified = objectRegistry::modified();
@@ -452,7 +519,8 @@ bool Foam::Time::writeTimeDict() const
     (
         IOstream::ASCII,
         IOstream::currentVersion,
-        IOstream::UNCOMPRESSED
+        IOstream::UNCOMPRESSED,
+        true
     );
 }
 
@@ -461,7 +529,8 @@ bool Foam::Time::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     if (writeTime())
@@ -470,7 +539,7 @@ bool Foam::Time::writeObject
 
         if (writeOK)
         {
-            writeOK = objectRegistry::writeObject(fmt, ver, cmp);
+            writeOK = objectRegistry::writeObject(fmt, ver, cmp, valid);
         }
 
         if (writeOK)
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index a19581f04..f10fad0d3 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,9 +31,53 @@ Description
 
 #include "Time.H"
 #include "IOobject.H"
+#include "IOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+bool Foam::Time::exists(IOobject& io)
+{
+    // Generate filename for object
+    fileName objPath(fileHandler().objectPath(io, word::null));
+
+    // Test for either directory or a (valid) file & IOobject
+    bool ok;
+    if (io.name().empty())
+    {
+        ok = fileHandler().isDir(objPath);
+    }
+    else
+    {
+        ok =
+            fileHandler().isFile(objPath)
+         && io.typeHeaderOk<IOList<label>>(false);// object with local scope
+    }
+
+    if (!ok)
+    {
+        // Re-test with raw objectPath. This is for backwards
+        // compatibility
+        fileName originalPath(io.objectPath());
+        if (originalPath != objPath)
+        {
+            // Test for either directory or a (valid) file & IOobject
+            if (io.name().empty())
+            {
+                ok = fileHandler().isDir(originalPath);
+            }
+            else
+            {
+                ok =
+                    fileHandler().isFile(originalPath)
+                 && io.typeHeaderOk<IOList<label>>(false);
+            }
+        }
+    }
+
+    return ok;
+}
+
+
 Foam::word Foam::Time::findInstance
 (
     const fileName& dir,
@@ -42,33 +86,33 @@ Foam::word Foam::Time::findInstance
     const word& stopInstance
 ) const
 {
-    // Note: if name is empty, just check the directory itself
+    // Note: - if name is empty, just check the directory itself
+    //       - check both for isFile and headerOk since the latter does a
+    //         filePath so searches for the file.
+    //       - check for an object with local file scope (so no looking up in
+    //         parent directory in case of parallel)
 
-
-    const fileName tPath(path());
-    const fileName dirPath(tPath/timeName()/dir);
-
-    // check the current time directory
-    if
-    (
-        name.empty()
-      ? isDir(dirPath)
-      :
-        (
-            isFile(dirPath/name)
-         && IOobject(name, timeName(), dir, *this).headerOk()
-        )
-    )
     {
-        if (debug)
-        {
-            InfoInFunction
-                << "Found \"" << name
-                << "\" in " << timeName()/dir
-                << endl;
-        }
+        IOobject io
+        (
+            name,           // name might be empty!
+            timeName(),
+            dir,
+            *this
+        );
 
-        return timeName();
+        if (exists(io))
+        {
+            if (debug)
+            {
+                InfoInFunction
+                    << "Found exact match for \"" << name
+                    << "\" in " << timeName()/dir
+                    << endl;
+            }
+
+            return timeName();
+        }
     }
 
     // Search back through the time directories to find the time
@@ -88,21 +132,20 @@ Foam::word Foam::Time::findInstance
     // continue searching from here
     for (; instanceI >= 0; --instanceI)
     {
-        if
+        IOobject io
         (
-            name.empty()
-          ? isDir(tPath/ts[instanceI].name()/dir)
-          :
-            (
-                isFile(tPath/ts[instanceI].name()/dir/name)
-             && IOobject(name, ts[instanceI].name(), dir, *this).headerOk()
-            )
-        )
+            name,           // name might be empty!
+            ts[instanceI].name(),
+            dir,
+            *this
+        );
+
+        if (exists(io))
         {
             if (debug)
             {
                 InfoInFunction
-                    << "Found \"" << name
+                    << "Found instance match for \"" << name
                     << "\" in " << ts[instanceI].name()/dir
                     << endl;
             }
@@ -115,7 +158,8 @@ Foam::word Foam::Time::findInstance
         {
             if (debug)
             {
-                InfoInFunction
+                //InfoInFunction
+                Pout<< "findInstance : "
                     << "Hit stopInstance " << stopInstance
                     << endl;
             }
@@ -155,21 +199,20 @@ Foam::word Foam::Time::findInstance
     // constant function of the time, because the latter points to
     // the case constant directory in parallel cases
 
-    if
+    IOobject io
     (
-        name.empty()
-      ? isDir(tPath/constant()/dir)
-      :
-        (
-            isFile(tPath/constant()/dir/name)
-         && IOobject(name, constant(), dir, *this).headerOk()
-        )
-    )
+        name,
+        constant(),
+        dir,
+        *this
+    );
+
+    if (exists(io))
     {
         if (debug)
         {
             InfoInFunction
-                << "Found \"" << name
+                << "Found constant match for \"" << name
                 << "\" in " << constant()/dir
                 << endl;
         }
diff --git a/src/OpenFOAM/db/Time/findTimes.C b/src/OpenFOAM/db/Time/findTimes.C
index ccd7312a2..bb09025e8 100644
--- a/src/OpenFOAM/db/Time/findTimes.C
+++ b/src/OpenFOAM/db/Time/findTimes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "Time.H"
-#include "OSspecific.H"
-#include "IStringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,62 +38,8 @@ Foam::instantList Foam::Time::findTimes
     const word& constantName
 )
 {
-    if (debug)
-    {
-        InfoInFunction << "Finding times in directory " << directory << endl;
-    }
-
-    // Read directory entries into a list
-    fileNameList dirEntries(readDir(directory, fileName::DIRECTORY));
-
-    // Initialise instant list
-    instantList Times(dirEntries.size() + 1);
-    label nTimes = 0;
-
-    // Check for "constant"
-    bool haveConstant = false;
-    forAll(dirEntries, i)
-    {
-        if (dirEntries[i] == constantName)
-        {
-            Times[nTimes].value() = 0;
-            Times[nTimes].name() = dirEntries[i];
-            nTimes++;
-            haveConstant = true;
-            break;
-        }
-    }
-
-    // Read and parse all the entries in the directory
-    forAll(dirEntries, i)
-    {
-        IStringStream timeStream(dirEntries[i]);
-        token timeToken(timeStream);
-
-        if (timeToken.isNumber() && timeStream.eof())
-        {
-            Times[nTimes].value() = timeToken.number();
-            Times[nTimes].name() = dirEntries[i];
-            nTimes++;
-        }
-    }
-
-    // Reset the length of the times list
-    Times.setSize(nTimes);
-
-    if (haveConstant)
-    {
-        if (nTimes > 2)
-        {
-            std::sort(&Times[1], Times.end(), instant::less());
-        }
-    }
-    else if (nTimes > 1)
-    {
-        std::sort(&Times[0], Times.end(), instant::less());
-    }
-
-    return Times;
+    return fileHandler().findTimes(directory, constantName);
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/instant/instant.C b/src/OpenFOAM/db/Time/instant/instant.C
index bcbe24e55..eb1e9e56f 100644
--- a/src/OpenFOAM/db/Time/instant/instant.C
+++ b/src/OpenFOAM/db/Time/instant/instant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,18 @@ bool Foam::operator!=(const instant& a, const instant& b)
 }
 
 
+bool Foam::operator<(const instant& a, const instant& b)
+{
+    return a.value_ < b.value_;
+}
+
+
+bool Foam::operator>(const instant& a, const instant& b)
+{
+    return a.value_ > b.value_;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, instant& I)
diff --git a/src/OpenFOAM/db/Time/instant/instant.H b/src/OpenFOAM/db/Time/instant/instant.H
index be3ea4e01..0eb4db8fc 100644
--- a/src/OpenFOAM/db/Time/instant/instant.H
+++ b/src/OpenFOAM/db/Time/instant/instant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,8 @@ class instant;
 
 bool operator==(const instant&, const instant&);
 bool operator!=(const instant&, const instant&);
+bool operator<(const instant&, const instant&);
+bool operator>(const instant&, const instant&);
 
 // IOstream Operators
 
@@ -141,6 +143,8 @@ public:
 
         friend bool operator==(const instant&, const instant&);
         friend bool operator!=(const instant&, const instant&);
+        friend bool operator<(const instant&, const instant&);
+        friend bool operator>(const instant&, const instant&);
 
 
     // IOstream Operators
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index b6b6e4e66..be540258c 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -325,7 +325,12 @@ Foam::instantList Foam::timeSelector::select
         forAll(timeDirs, timeI)
         {
             selectTimes[timeI] =
-                !exists(runTime.path()/timeDirs[timeI].name()/fName);
+               !fileHandler().exists
+                (
+                    runTime.path()
+                   /timeDirs[timeI].name()
+                   /fName
+                );
         }
 
         return subset(selectTimes, timeDirs);
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 586cb8ef4..722311c53 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dictionary.H"
-#include "IFstream.H"
 #include "inputModeEntry.H"
 #include "regExp.H"
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
index cc119532f..dd743d01f 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,11 +70,52 @@ Foam::dlLibraryTable& Foam::functionEntries::codeStream::libs
     const dictionary& dict
 )
 {
-    const IOdictionary& d = static_cast<const IOdictionary&>(dict.topDict());
+    const baseIOdictionary& d = static_cast<const baseIOdictionary&>
+    (
+        dict.topDict()
+    );
     return const_cast<Time&>(d.time()).libs();
 }
 
 
+bool Foam::functionEntries::codeStream::doingMasterOnlyReading
+(
+    const dictionary& dict
+)
+{
+    const dictionary& topDict = dict.topDict();
+
+    if (isA<baseIOdictionary>(topDict))
+    {
+        const baseIOdictionary& d = static_cast<const baseIOdictionary&>
+        (
+            topDict
+        );
+
+        if (debug)
+        {
+            Pout<< "codeStream : baseIOdictionary:" << dict.name()
+                << " master-only-reading:" << d.globalObject()
+                << endl;
+        }
+
+        return d.globalObject();
+    }
+    else
+    {
+        if (debug)
+        {
+            Pout<< "codeStream : not a baseIOdictionary:" << dict.name()
+                << " master-only-reading:" << regIOobject::masterOnlyReading
+                << endl;
+        }
+
+        // Fall back to regIOobject::masterOnlyReading
+        return regIOobject::masterOnlyReading;
+    }
+}
+
+
 Foam::functionEntries::codeStream::streamingFunctionType
 Foam::functionEntries::codeStream::getFunction
 (
@@ -96,7 +137,9 @@ Foam::functionEntries::codeStream::getFunction
 
     // see if library is loaded
     void* lib = nullptr;
-    if (isA<IOdictionary>(parentDict.topDict()))
+
+    const dictionary& topDict = parentDict.topDict();
+    if (isA<baseIOdictionary>(topDict))
     {
         lib = libs(parentDict).findLibrary(libPath);
     }
@@ -111,7 +154,7 @@ Foam::functionEntries::codeStream::getFunction
     // avoid compilation if possible by loading an existing library
     if (!lib)
     {
-        if (isA<IOdictionary>(parentDict.topDict()))
+        if (isA<baseIOdictionary>(topDict))
         {
             // Cached access to dl libs. Guarantees clean up upon destruction
             // of Time.
@@ -178,10 +221,10 @@ Foam::functionEntries::codeStream::getFunction
         }
 
         //- Only block if we're not doing master-only reading. (flag set by
-        //  regIOobject::read, IOdictionary constructor)
+        //  regIOobject::read, baseIOdictionary constructor)
         if
         (
-           !regIOobject::masterOnlyReading
+           !doingMasterOnlyReading(topDict)
          && regIOobject::fileModificationSkew > 0
         )
         {
@@ -246,7 +289,7 @@ Foam::functionEntries::codeStream::getFunction
             }
         }
 
-        if (isA<IOdictionary>(parentDict.topDict()))
+        if (isA<baseIOdictionary>(topDict))
         {
             // Cached access to dl libs. Guarantees clean up upon destruction
             // of Time.
@@ -282,7 +325,7 @@ Foam::functionEntries::codeStream::getFunction
     }
 
     bool haveLib = lib;
-    if (!regIOobject::masterOnlyReading)
+    if (!doingMasterOnlyReading(topDict))
     {
         reduce(haveLib, andOp<bool>());
     }
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
index 1dc2b57c8..5bb91ca1b 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,6 +123,10 @@ class codeStream
         //- Helper function: parent (of parent etc.) of dictionary up to the top
         static const dictionary& topDict(const dictionary&);
 
+        //- Helper function: access IOobject for master-only-reading
+        //  functionality
+        static bool doingMasterOnlyReading(const dictionary& dict);
+
         //- Helper function: access to dlLibraryTable of Time
         static dlLibraryTable& libs(const dictionary& dict);
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index 2ee26bca9..b07e3dfe7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,8 @@ License
 #include "IFstream.H"
 #include "addToMemberFunctionSelectionTable.H"
 #include "stringOps.H"
+#include "IOstreams.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -127,7 +129,10 @@ bool Foam::functionEntries::includeEntry::execute
     (
         includeFileName(is.name().path(), rawFName, parentDict)
     );
-    IFstream ifs(fName);
+
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
@@ -165,7 +170,10 @@ bool Foam::functionEntries::includeEntry::execute
     (
         includeFileName(is.name().path(), rawFName, parentDict)
     );
-    IFstream ifs(fName);
+
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
index 3598ab544..f38389f40 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,9 +25,10 @@ License
 
 #include "includeEtcEntry.H"
 #include "etcFiles.H"
-#include "IFstream.H"
 #include "stringOps.H"
 #include "addToMemberFunctionSelectionTable.H"
+#include "IOstreams.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -104,7 +105,10 @@ bool Foam::functionEntries::includeEtcEntry::execute
     (
         includeEtcFileName(rawFName, parentDict)
     );
-    IFstream ifs(fName);
+
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
@@ -142,7 +146,10 @@ bool Foam::functionEntries::includeEtcEntry::execute
     (
         includeEtcFileName(rawFName, parentDict)
     );
-    IFstream ifs(fName);
+
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
index b94fd1f22..287ca1f1e 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "dictionary.H"
 #include "IFstream.H"
 #include "addToMemberFunctionSelectionTable.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -70,7 +71,9 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
 )
 {
     const fileName fName(includeFileName(is, parentDict));
-    IFstream ifs(fName);
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
@@ -93,7 +96,9 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
 )
 {
     const fileName fName(includeFileName(is, parentDict));
-    IFstream ifs(fName);
+    //IFstream ifs(fName);
+    autoPtr<ISstream> ifsPtr(fileHandler().NewIFstream(fName));
+    ISstream& ifs = ifsPtr();
 
     if (ifs)
     {
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index 5248d2309..641a051a4 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,11 @@ Foam::dlLibraryTable::~dlLibraryTable()
                     << "Closing " << libNames_[i]
                     << " with handle " << uintptr_t(libPtrs_[i]) << endl;
             }
-            dlClose(libPtrs_[i]);
+            if (!dlClose(libPtrs_[i]))
+            {
+                WarningInFunction<< "Failed closing " << libNames_[i]
+                    << " with handle " << uintptr_t(libPtrs_[i]) << endl;
+            }
         }
     }
 }
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
index a84db3565..3553b151b 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,9 +122,9 @@ bool Foam::IOOutputFilter<OutputFilter>::read()
 
 
 template<class OutputFilter>
-bool Foam::IOOutputFilter<OutputFilter>::write()
+bool Foam::IOOutputFilter<OutputFilter>::write(const bool valid)
 {
-    return OutputFilter::write();
+    return OutputFilter::write(valid);
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index 17e81c672..20be6d440 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,7 +126,7 @@ public:
         using regIOobject::write;
 
         //- Sample and write
-        virtual bool write();
+        virtual bool write(const bool valid = true);
 
         //- Update for changes of mesh
         virtual void updateMesh(const mapPolyMesh& mpm);
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 04cfc5acf..bbd576fd3 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,12 @@ License
 #include "mapPolyMesh.H"
 #include "argList.H"
 #include "timeControlFunctionObject.H"
-#include "IFstream.H"
+//#include "IFstream.H"
 #include "dictionaryEntry.H"
 #include "stringOps.H"
 #include "Tuple2.H"
 #include "etcFiles.H"
+#include "IOdictionary.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -80,7 +81,7 @@ void Foam::functionObjectList::listDir
 {
     // Search specified directory for functionObject configuration files
     {
-        fileNameList foFiles(readDir(dir));
+        fileNameList foFiles(fileHandler().readDir(dir));
         forAll(foFiles, f)
         {
             if (foFiles[f].ext().empty())
@@ -92,7 +93,7 @@ void Foam::functionObjectList::listDir
 
     // Recurse into sub-directories
     {
-        fileNameList foDirs(readDir(dir, fileName::DIRECTORY));
+        fileNameList foDirs(fileHandler().readDir(dir, fileName::DIRECTORY));
         forAll(foDirs, fd)
         {
             listDir(dir/foDirs[fd], foMap);
@@ -248,7 +249,10 @@ bool Foam::functionObjectList::readFunctionObject
     }
 
     // Read the functionObject dictionary
-    IFstream fileStream(path);
+    //IFstream fileStream(path);
+    autoPtr<ISstream> fileStreamPtr(fileHandler().NewIFstream(path));
+    ISstream& fileStream = fileStreamPtr();
+
     dictionary funcsDict(fileStream);
     dictionary* funcDictPtr = &funcsDict;
 
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index 494ef3545..eef3966d8 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,6 +71,9 @@ Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
         }
     }
 
+    // Remove any ".."
+    baseDir.clean();
+
     return baseDir;
 }
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index e7957eb3e..b68644060 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -343,7 +343,8 @@ bool Foam::objectRegistry::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     bool ok = true;
@@ -363,7 +364,7 @@ bool Foam::objectRegistry::writeObject
 
         if (iter()->writeOpt() != NO_WRITE)
         {
-            ok = iter()->writeObject(fmt, ver, cmp) && ok;
+            ok = iter()->writeObject(fmt, ver, cmp, valid) && ok;
         }
     }
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 97627c687..45aa50a89 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -227,7 +227,8 @@ public:
             (
                 IOstream::streamFormat fmt,
                 IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::compressionType cmp,
+                const bool valid
             ) const;
 };
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 675e61118..0b6d4e26b 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,25 +27,13 @@ License
 #include "Time.H"
 #include "polyMesh.H"
 #include "registerSwitch.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineTypeNameAndDebug(regIOobject, 0);
-
-    template<>
-    const char* NamedEnum
-    <
-        regIOobject::fileCheckTypes,
-        4
-    >::names[] =
-    {
-        "timeStamp",
-        "timeStampMaster",
-        "inotify",
-        "inotifyMaster"
-    };
 }
 
 float Foam::regIOobject::fileModificationSkew
@@ -60,57 +48,6 @@ registerOptSwitch
 );
 
 
-const Foam::NamedEnum<Foam::regIOobject::fileCheckTypes, 4>
-    Foam::regIOobject::fileCheckTypesNames;
-
-Foam::regIOobject::fileCheckTypes Foam::regIOobject::fileModificationChecking
-(
-    fileCheckTypesNames.read
-    (
-        debug::optimisationSwitches().lookup
-        (
-            "fileModificationChecking"
-        )
-    )
-);
-
-namespace Foam
-{
-    // Register re-reader
-    class addfileModificationCheckingToOpt
-    :
-        public ::Foam::simpleRegIOobject
-    {
-    public:
-
-        addfileModificationCheckingToOpt(const char* name)
-        :
-            ::Foam::simpleRegIOobject(Foam::debug::addOptimisationObject, name)
-        {}
-
-        virtual ~addfileModificationCheckingToOpt()
-        {}
-
-        virtual void readData(Foam::Istream& is)
-        {
-            regIOobject::fileModificationChecking =
-                regIOobject::fileCheckTypesNames.read(is);
-        }
-
-        virtual void writeData(Foam::Ostream& os) const
-        {
-            os <<  regIOobject::fileCheckTypesNames
-                [regIOobject::fileModificationChecking];
-        }
-    };
-
-    addfileModificationCheckingToOpt addfileModificationCheckingToOpt_
-    (
-        "fileModificationChecking"
-    );
-}
-
-
 bool Foam::regIOobject::masterOnlyReading = false;
 
 
@@ -121,14 +58,13 @@ Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime)
     IOobject(io),
     registered_(false),
     ownedByRegistry_(false),
-    watchIndex_(-1),
+    watchIndices_(),
     eventNo_                // Do not get event for top level Time database
     (
         isTime
       ? 0
       : db().getEvent()
-    ),
-    isPtr_(nullptr)
+    )
 {
     // Register with objectRegistry if requested
     if (registerObject())
@@ -143,9 +79,8 @@ Foam::regIOobject::regIOobject(const regIOobject& rio)
     IOobject(rio),
     registered_(false),
     ownedByRegistry_(false),
-    watchIndex_(rio.watchIndex_),
-    eventNo_(db().getEvent()),
-    isPtr_(nullptr)
+    watchIndices_(rio.watchIndices_),
+    eventNo_(db().getEvent())
 {
     // Do not register copy with objectRegistry
 }
@@ -156,9 +91,8 @@ Foam::regIOobject::regIOobject(const regIOobject& rio, bool registerCopy)
     IOobject(rio),
     registered_(false),
     ownedByRegistry_(false),
-    watchIndex_(-1),
-    eventNo_(db().getEvent()),
-    isPtr_(nullptr)
+    watchIndices_(),
+    eventNo_(db().getEvent())
 {
     if (registerCopy && rio.registered_)
     {
@@ -178,9 +112,8 @@ Foam::regIOobject::regIOobject
     IOobject(newName, rio.instance(), rio.local(), rio.db()),
     registered_(false),
     ownedByRegistry_(false),
-    watchIndex_(-1),
-    eventNo_(db().getEvent()),
-    isPtr_(nullptr)
+    watchIndices_(),
+    eventNo_(db().getEvent())
 {
     if (registerCopy)
     {
@@ -198,9 +131,8 @@ Foam::regIOobject::regIOobject
     IOobject(io),
     registered_(false),
     ownedByRegistry_(false),
-    watchIndex_(-1),
-    eventNo_(db().getEvent()),
-    isPtr_(nullptr)
+    watchIndices_(),
+    eventNo_(db().getEvent())
 {
     if (registerObject())
     {
@@ -215,18 +147,12 @@ Foam::regIOobject::~regIOobject()
 {
     if (objectRegistry::debug)
     {
-        Info<< "Destroying regIOobject called " << name()
+        Pout<< "Destroying regIOobject called " << name()
             << " of type " << type()
             << " in directory " << path()
             << endl;
     }
 
-    if (isPtr_)
-    {
-        delete isPtr_;
-        isPtr_ = nullptr;
-    }
-
     // Check out of objectRegistry if not owned by the registry
 
     if (!ownedByRegistry_)
@@ -246,31 +172,6 @@ bool Foam::regIOobject::checkIn()
         // any mapping
         registered_ = db().checkIn(*this);
 
-        if
-        (
-            registered_
-         && readOpt() == MUST_READ_IF_MODIFIED
-         && time().runTimeModifiable()
-        )
-        {
-            if (watchIndex_ != -1)
-            {
-                FatalErrorInFunction
-                    << "Object " << objectPath()
-                    << " already watched with index " << watchIndex_
-                    << abort(FatalError);
-            }
-
-            fileName f = filePath();
-            if (!f.size())
-            {
-                // We don't have this file but would like to re-read it.
-                // Possibly if master-only reading mode.
-                f = objectPath();
-            }
-            watchIndex_ = time().addWatch(f);
-        }
-
         // check-in on defaultRegion is allowed to fail, since subsetted meshes
         // are created with the same name as their originating mesh
         if (!registered_ && debug && name() != polyMesh::defaultRegion)
@@ -305,11 +206,11 @@ bool Foam::regIOobject::checkOut()
     {
         registered_ = false;
 
-        if (watchIndex_ != -1)
+        forAllReverse(watchIndices_, i)
         {
-            time().removeWatch(watchIndex_);
-            watchIndex_ = -1;
+            fileHandler().removeWatch(watchIndices_[i]);
         }
+        watchIndices_.clear();
         return db().checkOut(*this);
     }
 
@@ -317,6 +218,99 @@ bool Foam::regIOobject::checkOut()
 }
 
 
+Foam::label Foam::regIOobject::addWatch(const fileName& f)
+{
+    label index = -1;
+
+    if
+    (
+        registered_
+     && readOpt() == MUST_READ_IF_MODIFIED
+     && time().runTimeModifiable()
+    )
+    {
+        index = fileHandler().findWatch(watchIndices_, f);
+
+        if (index == -1)
+        {
+            index = watchIndices_.size();
+            watchIndices_.append(fileHandler().addWatch(f));
+        }
+    }
+    return index;
+}
+
+
+void Foam::regIOobject::addWatch()
+{
+    if
+    (
+        registered_
+     && readOpt() == MUST_READ_IF_MODIFIED
+     && time().runTimeModifiable()
+    )
+    {
+        fileName f = filePath();
+        if (!f.size())
+        {
+            // We don't have this file but would like to re-read it.
+            // Possibly if master-only reading mode.
+            f = objectPath();
+        }
+
+        label index = fileHandler().findWatch(watchIndices_, f);
+        if (index != -1)
+        {
+            FatalErrorIn("regIOobject::addWatch()")
+                << "Object " << objectPath() << " of type " << type()
+                << " already watched with index " << watchIndices_[index]
+                << abort(FatalError);
+        }
+
+        // If master-only reading only the master will have all dependencies
+        // so scatter these to slaves
+        bool masterOnly =
+            global()
+         && (
+                regIOobject::fileModificationChecking == timeStampMaster
+             || regIOobject::fileModificationChecking == inotifyMaster
+            );
+
+        if (masterOnly && Pstream::parRun())
+        {
+            // Get master watched files
+            fileNameList watchFiles;
+            if (Pstream::master())
+            {
+                watchFiles.setSize(watchIndices_.size());
+                forAll(watchIndices_, i)
+                {
+                    watchFiles[i] = fileHandler().getFile(watchIndices_[i]);
+                }
+            }
+            Pstream::scatter(watchFiles);
+
+            if (!Pstream::master())
+            {
+                // unregister current ones
+                forAllReverse(watchIndices_, i)
+                {
+                    fileHandler().removeWatch(watchIndices_[i]);
+                }
+
+                watchIndices_.clear();
+                forAll(watchFiles, i)
+                {
+                    watchIndices_.append(fileHandler().addWatch(watchFiles[i]));
+                }
+            }
+        }
+
+        watchIndices_.append(fileHandler().addWatch(f));
+    }
+}
+
+
 bool Foam::regIOobject::upToDate(const regIOobject& a) const
 {
     if (a.eventNo() >= eventNo_)
@@ -420,13 +414,37 @@ void Foam::regIOobject::rename(const word& newName)
 }
 
 
+Foam::fileName Foam::regIOobject::filePath() const
+{
+    return localFilePath(type());
+}
+
+
+bool Foam::regIOobject::headerOk()
+{
+    // Note: Should be consistent with IOobject::typeHeaderOk(false)
+
+    bool ok = true;
+
+    fileName fName(filePath());
+
+    ok = Foam::fileHandler().readHeader(*this, fName, type());
+
+    if (!ok && IOobject::debug)
+    {
+        IOWarningInFunction(fName)
+            << "failed to read header of file " << objectPath()
+            << endl;
+    }
+
+    return ok;
+}
+
+
 void Foam::regIOobject::operator=(const IOobject& io)
 {
-    if (isPtr_)
-    {
-        delete isPtr_;
-        isPtr_ = nullptr;
-    }
+    // Close any file
+    isPtr_.clear();
 
     // Check out of objectRegistry
     checkOut();
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index aea17b9a6..a6f0ef9a1 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,6 +53,11 @@ namespace functionEntries
 {
     class codeStream;
 }
+namespace fileOperations
+{
+    class uncollatedFileOperation;
+    class masterUncollatedFileOperation;
+}
 
 /*---------------------------------------------------------------------------*\
                          Class regIOobject Declaration
@@ -62,22 +67,13 @@ class regIOobject
 :
     public IOobject
 {
-
-public:
-
-    //- Types of communications
-    enum fileCheckTypes
-    {
-        timeStamp,
-        timeStampMaster,
-        inotify,
-        inotifyMaster
-    };
-
-    static const NamedEnum<fileCheckTypes, 4> fileCheckTypesNames;
-
-
 protected:
+        //- Helper: check readOpt flags and read if necessary
+        bool readHeaderOk
+        (
+            const IOstream::streamFormat PstreamFormat,
+            const word& typeName
+        );
 
         //- To flag master-only reading of objects
         static bool masterOnlyReading;
@@ -93,20 +89,20 @@ private:
         //- Is this object owned by the registry
         bool ownedByRegistry_;
 
-        //- Modification watch index
-        mutable label watchIndex_;
+        //- List of modification watch indices
+        mutable labelList watchIndices_;
 
         //- eventNo of last update
         label eventNo_;
 
         //- Istream for reading
-        Istream* isPtr_;
+        autoPtr<ISstream> isPtr_;
 
 
     // Private Member Functions
 
         //- Return Istream
-        Istream& readStream();
+        Istream& readStream(const bool valid = true);
 
         //- Dissallow assignment
         void operator=(const regIOobject&);
@@ -117,6 +113,8 @@ public:
         //- Declare friendship with any classes that need access to
         //  masterOnlyReading
         friend class functionEntries::codeStream;
+        friend class fileOperations::uncollatedFileOperation;
+        friend class fileOperations::masterUncollatedFileOperation;
 
 
     // Static data
@@ -126,8 +124,6 @@ public:
 
         static float fileModificationSkew;
 
-        static fileCheckTypes fileModificationChecking;
-
 
     // Constructors
 
@@ -164,6 +160,9 @@ public:
             //- Remove object from registry
             bool checkOut();
 
+            //- Add file watch on object (if registered and READ_IF_MODIFIED)
+            virtual void addWatch();
+
             //- Is this object owned by the registry?
             inline bool ownedByRegistry() const;
 
@@ -235,8 +234,17 @@ public:
 
         // Reading
 
+            //- Return complete path + object name if the file exists
+            //  in the case directory otherwise null. Does not search
+            //  up if parallel. Can be overridden to provide this functionality
+            //  (e.g. IOdictionary)
+            virtual fileName filePath() const;
+
+            //- Read and check header info
+            bool headerOk();
+
             //- Return Istream and check object type against that given
-            Istream& readStream(const word&);
+            Istream& readStream(const word&, const bool valid = true);
 
             //- Close Istream
             void close();
@@ -249,11 +257,15 @@ public:
             //- Read object
             virtual bool read();
 
-            //- Return file-monitoring handle
-            inline label watchIndex() const;
+            //- Add file watch for fileName on object if not yet watched. Return
+            //  index of watch
+            virtual label addWatch(const fileName&);
 
-            //- Return file-monitoring handle
-            inline label& watchIndex();
+            //- Return file-monitoring handles
+            inline const labelList& watchIndices() const;
+
+            //- Return file-monitoring handles
+            inline labelList& watchIndices();
 
             //- Return true if the object's file (or files for objectRegistry)
             //  have been modified. (modified state is cached by Time)
@@ -274,11 +286,21 @@ public:
             (
                 IOstream::streamFormat,
                 IOstream::versionNumber,
-                IOstream::compressionType
+                IOstream::compressionType,
+                const bool valid
             ) const;
 
             //- Write using setting from DB
-            virtual bool write() const;
+            virtual bool write(const bool valid = true) const;
+
+
+        // Other
+
+            //- Is object global
+            virtual bool global() const
+            {
+                return false;
+            }
 
 
     // Member operators
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index ced5ee486..ac32db83a 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,15 +88,15 @@ inline Foam::label& Foam::regIOobject::eventNo()
 }
 
 
-inline Foam::label Foam::regIOobject::watchIndex() const
+inline const Foam::labelList& Foam::regIOobject::watchIndices() const
 {
-    return watchIndex_;
+    return watchIndices_;
 }
 
 
-inline Foam::label& Foam::regIOobject::watchIndex()
+inline Foam::labelList& Foam::regIOobject::watchIndices()
 {
-    return watchIndex_;
+    return watchIndices_;
 }
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 0a9ae8831..dc9b5d3cd 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -27,10 +27,65 @@ License
 #include "IFstream.H"
 #include "Time.H"
 #include "Pstream.H"
+#include "HashSet.H"
+#include "fileOperation.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+bool Foam::regIOobject::readHeaderOk
+(
+    const IOstream::streamFormat format,
+    const word& typeName
+)
+{
+    // Everyone check or just master
+    bool masterOnly =
+        global()
+     && (
+            regIOobject::fileModificationChecking == timeStampMaster
+         || regIOobject::fileModificationChecking == inotifyMaster
+        );
+
+
+    // Check if header is ok for READ_IF_PRESENT
+    bool isHeaderOk = false;
+    if (readOpt() == IOobject::READ_IF_PRESENT)
+    {
+        if (masterOnly)
+        {
+            if (Pstream::master())
+            {
+                isHeaderOk = headerOk();
+            }
+            Pstream::scatter(isHeaderOk);
+        }
+        else
+        {
+            isHeaderOk = headerOk();
+        }
+    }
+
+    if
+    (
+        (
+            readOpt() == IOobject::MUST_READ
+         || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || isHeaderOk
+    )
+    {
+        return fileHandler().read(*this, masterOnly, format, typeName);
+    }
+    else
+    {
+        return false;
+    }
+}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::regIOobject::readStream()
+Foam::Istream& Foam::regIOobject::readStream(const bool valid)
 {
     if (IFstream::debug)
     {
@@ -49,90 +104,66 @@ Foam::Istream& Foam::regIOobject::readStream()
     }
 
     // Construct object stream and read header if not already constructed
-    if (!isPtr_)
+    if (!isPtr_.valid())
     {
-
         fileName objPath;
-        if (watchIndex_ != -1)
+        if (watchIndices_.size())
         {
             // File is being watched. Read exact file that is being watched.
-            objPath = time().getFile(watchIndex_);
+            objPath = fileHandler().getFile(watchIndices_.last());
         }
         else
         {
             // Search intelligently for file
             objPath = filePath();
 
-            if (!objPath.size())
+            if (IFstream::debug)
             {
-                FatalIOError
-                (
-                    "regIOobject::readStream()",
-                    __FILE__,
-                    __LINE__,
-                    objectPath(),
-                    0
-                )   << "cannot find file"
-                    << exit(FatalIOError);
+                Pout<< "regIOobject::readStream() : "
+                    << "found object " << name()
+                    << " (global " << global() << ")"
+                    << " in file " << objPath
+                    << endl;
             }
         }
 
-        if (!(isPtr_ = objectStream(objPath)))
-        {
-            FatalIOError
-            (
-                "regIOobject::readStream()",
-                __FILE__,
-                __LINE__,
-                objPath,
-                0
-            )   << "cannot open file"
-                << exit(FatalIOError);
-        }
-        else if (!readHeader(*isPtr_))
-        {
-            FatalIOErrorInFunction(*isPtr_)
-                << "problem while reading header for object " << name()
-                << exit(FatalIOError);
-        }
+        isPtr_ = fileHandler().readStream(*this, objPath, type(), valid);
     }
 
-    // Mark as uptodate if read successfully
-    if (watchIndex_ != -1)
-    {
-        time().setUnmodified(watchIndex_);
-    }
-
-    return *isPtr_;
+    return isPtr_();
 }
 
 
-Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
+Foam::Istream& Foam::regIOobject::readStream
+(
+    const word& expectName,
+    const bool valid
+)
 {
     if (IFstream::debug)
     {
-        InfoInFunction
-            << "Reading object " << name()
-            << " from file " << objectPath()
+        Pout<< "regIOobject::readStream(const word&) : "
+            << "reading object " << name()
             << endl;
     }
 
     // Construct IFstream if not already constructed
-    if (!isPtr_)
+    if (!isPtr_.valid())
     {
-        readStream();
+        readStream(valid);
 
         // Check the className of the regIOobject
         // dictionary is an allowable name in case the actual class
         // instantiated is a dictionary
         if
         (
-            expectName.size()
+            valid
+         && expectName.size()
          && headerClassName() != expectName
          && headerClassName() != "dictionary"
         )
         {
-            FatalIOErrorInFunction(*isPtr_)
+            FatalIOErrorInFunction(isPtr_())
                 << "unexpected class name " << headerClassName()
                 << " expected " << expectName << endl
                 << "    while reading object " << name()
@@ -140,7 +171,7 @@ Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
         }
     }
 
-    return *isPtr_;
+    return isPtr_();
 }
 
 
@@ -148,16 +179,12 @@ void Foam::regIOobject::close()
 {
     if (IFstream::debug)
     {
-        InfoInFunction
-            << "Finished reading " << filePath()
+        Pout<< "regIOobject::close() : "
+            << "finished reading " << isPtr_().name()
             << endl;
     }
 
-    if (isPtr_)
-    {
-        delete isPtr_;
-        isPtr_ = nullptr;
-    }
+    isPtr_.clear();
 }
 
 
@@ -172,132 +199,96 @@ bool Foam::regIOobject::read()
     // Note: cannot do anything in readStream itself since this is used by
     // e.g. GeometricField.
 
+
+    // Save old watchIndices and clear (so the list of included files can
+    // change)
+    fileNameList oldWatchFiles;
+    if (watchIndices_.size())
+    {
+        oldWatchFiles.setSize(watchIndices_.size());
+        forAll(watchIndices_, i)
+        {
+            oldWatchFiles[i] = fileHandler().getFile(watchIndices_[i]);
+        }
+        forAllReverse(watchIndices_, i)
+        {
+            fileHandler().removeWatch(watchIndices_[i]);
+        }
+        watchIndices_.clear();
+    }
+
+
+    // Read
     bool masterOnly =
-        regIOobject::fileModificationChecking == timeStampMaster
-     || regIOobject::fileModificationChecking == inotifyMaster;
-
-    bool ok = true;
-    if (Pstream::master() || !masterOnly)
-    {
-        if (IFstream::debug)
-        {
-            Pout<< "regIOobject::read() : "
-                << "reading object " << name()
-                << " from file " << endl;
-        }
-
-        // Set flag for e.g. codeStream
-        bool oldFlag = regIOobject::masterOnlyReading;
-        regIOobject::masterOnlyReading = masterOnly;
-
-        // Read file
-        ok = readData(readStream(type()));
-        close();
-
-        regIOobject::masterOnlyReading = oldFlag;
-    }
-
-    if (masterOnly && Pstream::parRun())
-    {
-        // Scatter master data using communication scheme
-
-        const List<Pstream::commsStruct>& comms =
-        (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
-          ? Pstream::linearCommunication()
-          : Pstream::treeCommunication()
+        global()
+     && (
+            regIOobject::fileModificationChecking == timeStampMaster
+         || regIOobject::fileModificationChecking == inotifyMaster
         );
 
-        // Master reads headerclassname from file. Make sure this gets
-        // transfered as well as contents.
-        Pstream::scatter
-        (
-            comms,
-            const_cast<word&>(headerClassName()),
-            Pstream::msgType(),
-            Pstream::worldComm
-        );
-        Pstream::scatter(comms, note(), Pstream::msgType(), Pstream::worldComm);
+    // Note: IOstream::binary flag is for all the processor comms. (Only for
+    //       dictionaries should it be ascii)
+    bool ok = fileHandler().read(*this, masterOnly, IOstream::BINARY, type());
 
-
-        // Get my communication order
-        const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
-
-        // Reveive from up
-        if (myComm.above() != -1)
-        {
-            if (IFstream::debug)
-            {
-                Pout<< "regIOobject::read() : "
-                    << "reading object " << name()
-                    << " from processor " << myComm.above()
-                    << endl;
-            }
-
-            // Note: use ASCII for now - binary IO of dictionaries is
-            // not currently supported
-            IPstream fromAbove
-            (
-                Pstream::commsTypes::scheduled,
-                myComm.above(),
-                0,
-                Pstream::msgType(),
-                Pstream::worldComm,
-                IOstream::ASCII
-            );
-            ok = readData(fromAbove);
-        }
-
-        // Send to my downstairs neighbours. Note reverse order not
-        // nessecary here - just for consistency reasons.
-        forAllReverse(myComm.below(), belowI)
-        {
-            OPstream toBelow
-            (
-                Pstream::commsTypes::scheduled,
-                myComm.below()[belowI],
-                0,
-                Pstream::msgType(),
-                Pstream::worldComm,
-                IOstream::ASCII
-            );
-            writeData(toBelow);
-        }
+    if (oldWatchFiles.size())
+    {
+        // Re-watch master file
+        addWatch();
     }
+
     return ok;
 }
 
 
 bool Foam::regIOobject::modified() const
 {
-    if (watchIndex_ != -1)
+    forAllReverse(watchIndices_, i)
     {
-        return time().getState(watchIndex_) != fileMonitor::UNMODIFIED;
-    }
-    else
-    {
-        return false;
+        if (fileHandler().getState(watchIndices_[i]) != fileMonitor::UNMODIFIED)
+        {
+            return true;
+        }
     }
+
+    return false;
 }
 
 
 bool Foam::regIOobject::readIfModified()
 {
-    if (watchIndex_ != -1)
+    // Get index of modified file so we can give nice message. Could instead
+    // just call above modified()
+    label modified = -1;
+    forAllReverse(watchIndices_, i)
     {
-        if (modified())
+        if (fileHandler().getState(watchIndices_[i]) != fileMonitor::UNMODIFIED)
         {
-            const fileName& fName = time().getFile(watchIndex_);
-            InfoInFunction
-                << nl
+            modified = watchIndices_[i];
+            break;
+        }
+    }
+
+    if (modified != -1)
+    {
+        const fileName fName = fileHandler().getFile(watchIndices_.last());
+
+        if (modified == watchIndices_.last())
+        {
+            Info<< "regIOobject::readIfModified() : " << nl
                 << "    Re-reading object " << name()
                 << " from file " << fName << endl;
-            return read();
         }
         else
         {
-            return false;
+            Info<< "regIOobject::readIfModified() : " << nl
+                << "    Re-reading object " << name()
+                << " from file " << fName
+                << " because of modified file "
+                << fileHandler().getFile(modified)
+                << endl;
         }
+
+        return read();
     }
     else
     {
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index c2b891cd0..3538cfdb6 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,8 @@ bool Foam::regIOobject::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     if (!good())
@@ -58,77 +59,120 @@ bool Foam::regIOobject::writeObject
         return false;
     }
 
-    if
+
+
+    //- uncomment this if you want to write global objects on master only
+    //bool isGlobal = global();
+    bool isGlobal = false;
+
+    if (instance() == time().timeName())
+    {
+        // Mark as written to local directory
+        isGlobal = false;
+    }
+    else if
     (
-        instance() != time().timeName()
-     && instance() != time().system()
+        instance() != time().system()
      && instance() != time().caseSystem()
      && instance() != time().constant()
      && instance() != time().caseConstant()
     )
     {
+        // Update instance
         const_cast<regIOobject&>(*this).instance() = time().timeName();
-    }
 
-    mkDir(path());
+        // Mark as written to local directory
+        isGlobal = false;
+    }
 
     if (OFstream::debug)
     {
-        InfoInFunction << "Writing file " << objectPath();
+        if (isGlobal)
+        {
+            Pout<< "regIOobject::write() : "
+                << "writing (global) file " << objectPath();
+        }
+        else
+        {
+            Pout<< "regIOobject::write() : "
+                << "writing (local) file " << objectPath();
+        }
     }
 
 
     bool osGood = false;
 
+
+    // Everyone check or just master
+    bool masterOnly =
+        isGlobal
+     && (
+            regIOobject::fileModificationChecking == timeStampMaster
+         || regIOobject::fileModificationChecking == inotifyMaster
+        );
+
+
+    if (Pstream::master() || !masterOnly)
     {
-        // Try opening an OFstream for object
-        OFstream os(objectPath(), fmt, ver, cmp);
-
-        // If any of these fail, return (leave error handling to Ostream class)
-        if (!os.good())
-        {
-            return false;
-        }
-
-        if (!writeHeader(os))
-        {
-            return false;
-        }
-
-        // Write the data to the Ostream
-        if (!writeData(os))
-        {
-            return false;
-        }
-
-        writeEndDivider(os);
-
-        osGood = os.good();
+        //if (mkDir(path()))
+        //{
+        //    // Try opening an OFstream for object
+        //    OFstream os(objectPath(), fmt, ver, cmp);
+        //
+        //    // If any of these fail, return (leave error handling to Ostream
+        //    // class)
+        //    if (!os.good())
+        //    {
+        //        return false;
+        //    }
+        //
+        //    if (!writeHeader(os))
+        //    {
+        //        return false;
+        //    }
+        //
+        //    // Write the data to the Ostream
+        //    if (!writeData(os))
+        //    {
+        //        return false;
+        //    }
+        //
+        //    writeEndDivider(os);
+        //
+        //    osGood = os.good();
+        //}
+        osGood = fileHandler().writeObject(*this, fmt, ver, cmp, valid);
+    }
+    else
+    {
+        // Or scatter the master osGood?
+        osGood = true;
     }
 
     if (OFstream::debug)
     {
-        Info<< " .... written" << endl;
+        Pout<< " .... written" << endl;
     }
 
     // Only update the lastModified_ time if this object is re-readable,
     // i.e. lastModified_ is already set
-    if (watchIndex_ != -1)
+    if (watchIndices_.size())
     {
-        time().setUnmodified(watchIndex_);
+        fileHandler().setUnmodified(watchIndices_.last());
     }
 
     return osGood;
 }
 
 
-bool Foam::regIOobject::write() const
+bool Foam::regIOobject::write(const bool valid) const
 {
     return writeObject
     (
         time().writeFormat(),
         IOstream::currentVersion,
-        time().writeCompression()
+        time().writeCompression(),
+        valid
     );
 }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 28ed8a7bc..9005eb8b5 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -27,6 +27,7 @@ License
 #include "Time.H"
 #include "demandDrivenData.H"
 #include "dictionary.H"
+#include "localIOdictionary.H"
 #include "data.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,18 +72,19 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::readFields
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::readFields()
 {
-    const IOdictionary dict
+    const localIOdictionary dict
     (
         IOobject
         (
             this->name(),
-            this->time().timeName(),
+            this->instance(),
+            this->local(),
             this->db(),
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
             false
         ),
-        this->readStream(typeName)
+        typeName
     );
 
     this->close();
@@ -105,7 +107,14 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readIfPresent()
             << " suggests that a read constructor for field " << this->name()
             << " would be more appropriate." << endl;
     }
-    else if (this->readOpt() == IOobject::READ_IF_PRESENT && this->headerOk())
+    else if
+    (
+        this->readOpt() == IOobject::READ_IF_PRESENT
+     && this->template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh>>
+        (
+            true
+        )
+    )
     {
         readFields();
 
@@ -142,7 +151,13 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readOldTimeIfPresent()
         this->registerObject()
     );
 
-    if (field0.headerOk())
+    if
+    (
+        field0.template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh>>
+        (
+            true
+        )
+    )
     {
         if (debug)
         {
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
index 767e4daf0..1ae2244e2 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,6 +89,19 @@ public:
 
         bool writeData(Ostream&) const;
 
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
+
 
     // Member Operators
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.C
index 1f434f4f2..dbd463810 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "timeVaryingUniformFixedValuePointPatchField.H"
 #include "Time.H"
-#include "IFstream.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index c28814f59..9d5ca421c 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -33,6 +33,8 @@ License
 #include "labelList.H"
 #include "regIOobject.H"
 #include "dynamicCode.H"
+#include "uncollatedFileOperation.H"
+#include "masterUncollatedFileOperation.H"
 
 #include <cctype>
 
@@ -582,13 +584,43 @@ void Foam::argList::parse
         }
     }
 
+
+    // Set fileHandler. In increasing order of priority:
+    // 1. default = uncollated
+    // 2. environment var FOAM_FILEHANDLER
+    // 3. etc/controlDict optimisationSwitches 'fileHandler'
+    // 4. system/controlDict 'fileHandler' (not handled here; done in TimeIO.C)
+
+    {
+        word handlerType(getEnv("FOAM_FILEHANDLER"));
+        HashTable<string>::const_iterator iter = options_.find("fileHandler");
+        if (iter != options_.end())
+        {
+            handlerType = iter();
+        }
+
+        if (handlerType.empty())
+        {
+            handlerType = fileOperation::defaultFileHandler;
+        }
+
+        autoPtr<fileOperation> handler
+        (
+            fileOperation::New
+            (
+                handlerType,
+                bannerEnabled
+            )
+        );
+        Foam::fileHandler(handler);
+    }
+
     // Case is a single processor run unless it is running parallel
     int nProcs = 1;
 
     // Roots if running distributed
     fileNameList roots;
 
-
     // If this actually is a parallel run
     if (parRunControl_.parRun())
     {
@@ -924,6 +956,10 @@ void Foam::argList::parse
 Foam::argList::~argList()
 {
     jobInfo.end();
+
+    // Delete file handler to flush any remaining IO
+    autoPtr<fileOperation> dummy(nullptr);
+    fileHandler(dummy);
 }
 
 
@@ -1250,7 +1286,7 @@ bool Foam::argList::check(bool checkArgs, bool checkOpts) const
 
 bool Foam::argList::checkRootCase() const
 {
-    if (!isDir(rootPath()))
+    if (!fileHandler().isDir(rootPath()))
     {
         FatalError
             << executable_
@@ -1260,9 +1296,12 @@ bool Foam::argList::checkRootCase() const
         return false;
     }
 
-    if (!isDir(path()) && Pstream::master())
+    fileName pathDir(fileHandler().filePath(path()));
+
+    if (pathDir.empty() && Pstream::master())
     {
         // Allow slaves on non-existing processor directories, created later
+        // (e.g. redistributePar)
         FatalError
             << executable_
             << ": cannot open case directory " << path()
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
new file mode 100644
index 000000000..b5c8ab494
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
@@ -0,0 +1,335 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstreamCollator.H"
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "IOstreams.H"
+#include "Pstream.H"
+#include "decomposedBlockData.H"
+#include "PstreamReduceOps.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(OFstreamCollator, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::OFstreamCollator::writeFile
+(
+    const label comm,
+    const word& typeName,
+    const fileName& fName,
+    const string& s,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool append
+)
+{
+    if (debug)
+    {
+        Pout<< "OFstreamCollator : Writing " << s.size()
+            << " bytes to " << fName
+            << " using comm " << comm << endl;
+    }
+
+    autoPtr<OSstream> osPtr;
+    if (UPstream::master(comm))
+    {
+        Foam::mkDir(fName.path());
+        osPtr.reset
+        (
+            new OFstream
+            (
+                fName,
+                fmt,
+                ver,
+                cmp,
+                append
+            )
+        );
+
+        // We don't have IOobject so cannot use IOobject::writeHeader
+        OSstream& os = osPtr();
+        decomposedBlockData::writeHeader
+        (
+            os,
+            ver,
+            fmt,
+            typeName,
+            "",
+            fName,
+            fName.name()
+        );
+    }
+
+    UList<char> slice(const_cast<char*>(s.data()), label(s.size()));
+
+    // Assuming threaded writing hides any slowness so we might
+    // as well use scheduled communication to send the data to
+    // the master processor in order.
+
+    List<std::streamoff> start;
+    decomposedBlockData::writeBlocks
+    (
+        comm,
+        osPtr,
+        start,
+        slice,
+        UPstream::commsTypes::scheduled,
+        false       // do not reduce return state
+    );
+
+    if (osPtr.valid() && !osPtr().good())
+    {
+        FatalIOErrorInFunction(osPtr())
+            << "Failed writing to " << fName << exit(FatalIOError);
+    }
+
+    if (debug)
+    {
+        Pout<< "OFstreamCollator : Finished writing " << s.size()
+            << " bytes to " << fName
+            << " using comm " << comm << endl;
+    }
+
+    return true;
+}
+
+
+void* Foam::OFstreamCollator::writeAll(void *threadarg)
+{
+    OFstreamCollator& handler = *static_cast<OFstreamCollator*>(threadarg);
+
+    // Consume stack
+    while (true)
+    {
+        writeData* ptr = nullptr;
+
+        //pthread_mutex_lock(&handler.mutex_);
+        lockMutex(handler.mutex_);
+
+        if (handler.objects_.size())
+        {
+            ptr = handler.objects_.pop();
+        }
+        //pthread_mutex_unlock(&handler.mutex_);
+        unlockMutex(handler.mutex_);
+
+        if (!ptr)
+        {
+            break;
+        }
+        else
+        {
+            bool ok = writeFile
+            (
+                handler.comm_,
+                ptr->typeName_,
+                ptr->pathName_,
+                ptr->data_,
+                ptr->format_,
+                ptr->version_,
+                ptr->compression_,
+                ptr->append_
+            );
+            if (!ok)
+            {
+                FatalIOErrorInFunction(ptr->pathName_)
+                    << "Failed writing " << ptr->pathName_
+                    << exit(FatalIOError);
+            }
+
+            delete ptr;
+        }
+        //sleep(1);
+    }
+
+    if (debug)
+    {
+        Pout<< "OFstreamCollator : Exiting write thread " << endl;
+    }
+
+    //pthread_mutex_lock(&handler.mutex_);
+    lockMutex(handler.mutex_);
+    handler.threadRunning_ = false;
+    //pthread_mutex_unlock(&handler.mutex_);
+    unlockMutex(handler.mutex_);
+
+    return nullptr;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::OFstreamCollator::OFstreamCollator(const off_t maxBufferSize)
+:
+    maxBufferSize_(maxBufferSize),
+    //mutex_(PTHREAD_MUTEX_INITIALIZER),
+    mutex_
+    (
+        maxBufferSize_ > 0
+      ? allocateMutex()
+      : -1
+    ),
+    thread_
+    (
+        maxBufferSize_ > 0
+      ? allocateThread()
+      : -1
+    ),
+    threadRunning_(false),
+    comm_
+    (
+        UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            identity(UPstream::nProcs(UPstream::worldComm))
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::OFstreamCollator::~OFstreamCollator()
+{
+    if (threadRunning_)
+    {
+        if (debug)
+        {
+            Pout<< "~OFstreamCollator : Waiting for write thread" << endl;
+        }
+
+        //pthread_join(thread_, nullptr);
+        joinThread(thread_);
+    }
+    if (thread_ != -1)
+    {
+        freeThread(thread_);
+    }
+    if (mutex_ != -1)
+    {
+        freeMutex(mutex_);
+    }
+    if (comm_ != -1)
+    {
+        UPstream::freeCommunicator(comm_);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::OFstreamCollator::write
+(
+    const word& typeName,
+    const fileName& fName,
+    const string& data,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool append
+)
+{
+    if (maxBufferSize_ > 0)
+    {
+        while (true)
+        {
+            // Count files to be written
+            off_t totalSize = 0;
+            //pthread_mutex_lock(&mutex_);
+            lockMutex(mutex_);
+            forAllConstIter(FIFOStack<writeData*>, objects_, iter)
+            {
+                totalSize += iter()->data_.size();
+            }
+            //pthread_mutex_unlock(&mutex_);
+            unlockMutex(mutex_);
+
+            if
+            (
+                totalSize == 0
+             || (totalSize+off_t(data.size()) < maxBufferSize_)
+            )
+            {
+                break;
+            }
+
+            if (debug)
+            {
+                Pout<< "OFstreamCollator : Waiting for buffer space."
+                    << " Currently in use:" << totalSize
+                    << " limit:" << maxBufferSize_
+                    << endl;
+            }
+
+            sleep(5);
+        }
+
+        if (debug)
+        {
+            Pout<< "OFstreamCollator : relaying write of " << fName
+                << " to thread " << endl;
+        }
+        //pthread_mutex_lock(&mutex_);
+        lockMutex(mutex_);
+        objects_.push
+        (
+            new writeData(typeName, fName, data, fmt, ver, cmp, append)
+        );
+        //pthread_mutex_unlock(&mutex_);
+        unlockMutex(mutex_);
+
+        //pthread_mutex_lock(&mutex_);
+        lockMutex(mutex_);
+        if (!threadRunning_)
+        {
+            createThread(thread_, writeAll, this);
+            if (debug)
+            {
+                Pout<< "OFstreamCollator : Started write thread " << endl;
+            }
+            threadRunning_ = true;
+        }
+        //pthread_mutex_unlock(&mutex_);
+        unlockMutex(mutex_);
+
+        return true;
+    }
+    else
+    {
+        // Immediate writing
+        return writeFile(comm_, typeName, fName, data, fmt, ver, cmp, append);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H
new file mode 100644
index 000000000..17904fc38
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::OFstreamCollator
+
+Description
+    Threaded file writer.
+
+SourceFiles
+    OFstreamCollator.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef OFstreamCollator_H
+#define OFstreamCollator_H
+
+#include "IOstream.H"
+#include "List.H"
+#include "FIFOStack.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class OFstreamCollator Declaration
+\*---------------------------------------------------------------------------*/
+
+class OFstreamCollator
+{
+    // Private class
+
+        class writeData
+        {
+        public:
+
+            const word typeName_;
+            const fileName pathName_;
+            const string data_;
+            const IOstream::streamFormat format_;
+            const IOstream::versionNumber version_;
+            const IOstream::compressionType compression_;
+            const bool append_;
+
+            writeData
+            (
+                const word& typeName,
+                const fileName& pathName,
+                const string& data,
+                IOstream::streamFormat format,
+                IOstream::versionNumber version,
+                IOstream::compressionType compression,
+                const bool append
+            )
+            :
+                typeName_(typeName),
+                pathName_(pathName),
+                data_(data),
+                format_(format),
+                version_(version),
+                compression_(compression),
+                append_(append)
+            {}
+        };
+
+
+    // Private data
+
+        const off_t maxBufferSize_;
+
+        //pthread_mutex_t mutex_;
+        label mutex_;
+
+        //pthread_t thread_;
+        label thread_;
+
+        FIFOStack<writeData*> objects_;
+
+        bool threadRunning_;
+
+        //- Communicator to use for all parallel ops
+        label comm_;
+
+
+    // Private Member Functions
+
+        //- Write actual file
+        static bool writeFile
+        (
+            const label comm,
+            const word& typeName,
+            const fileName& fName,
+            const string& data,
+            IOstream::streamFormat fmt,
+            IOstream::versionNumber ver,
+            IOstream::compressionType cmp,
+            const bool append
+        );
+
+        //- Write all files in stack
+        static void* writeAll(void *threadarg);
+
+
+public:
+
+    // Declare name of the class and its debug switch
+    TypeName("OFstreamCollator");
+
+
+    // Constructors
+
+        //- Construct from buffer size. 0 = do not use thread
+        OFstreamCollator(const off_t maxBufferSize);
+
+
+    //- Destructor
+    virtual ~OFstreamCollator();
+
+
+    // Member functions
+
+        //- Write file with contents. Blocks until writethread has space
+        //  available (total file sizes < maxBufferSize)
+        bool write
+        (
+            const word& typeName,
+            const fileName&,
+            const string& data,
+            IOstream::streamFormat,
+            IOstream::versionNumber,
+            IOstream::compressionType,
+            const bool append
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
new file mode 100644
index 000000000..0984b675f
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -0,0 +1,393 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "collatedFileOperation.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Pstream.H"
+#include "Time.H"
+#include "threadedCollatedOFstream.H"
+#include "decomposedBlockData.H"
+#include "registerSwitch.H"
+#include "masterOFstream.H"
+#include "OFstream.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+namespace fileOperations
+{
+    defineTypeNameAndDebug(collatedFileOperation, 0);
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        collatedFileOperation,
+        word
+    );
+
+    float collatedFileOperation::maxThreadFileBufferSize
+    (
+        debug::floatOptimisationSwitch("maxThreadFileBufferSize", 1e9)
+    );
+    registerOptSwitch
+    (
+        "maxThreadFileBufferSize",
+        float,
+        collatedFileOperation::maxThreadFileBufferSize
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::fileOperations::collatedFileOperation::appendObject
+(
+    const regIOobject& io,
+    const fileName& pathName,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp
+) const
+{
+    // Append to processors/ file
+
+    fileName prefix;
+    fileName postfix;
+    label proci = splitProcessorPath(io.objectPath(), prefix, postfix);
+
+    if (debug)
+    {
+        Pout<< "writeObject:" << " : For local object : "
+            << io.name()
+            << " appending processor " << proci
+            << " data to " << pathName << endl;
+    }
+
+    if (proci == -1)
+    {
+        FatalErrorInFunction
+            << "Not a valid processor path " << pathName
+            << exit(FatalError);
+    }
+
+
+    // Create string from all data to write
+    string buf;
+    {
+        OStringStream os(fmt, ver);
+        if (proci == 0)
+        {
+            if (!io.writeHeader(os))
+            {
+                return false;
+            }
+        }
+
+        // Write the data to the Ostream
+        if (!io.writeData(os))
+        {
+            return false;
+        }
+
+        if (proci == 0)
+        {
+            IOobject::writeEndDivider(os);
+        }
+
+        buf = os.str();
+    }
+
+
+    bool append = (proci > 0);
+
+    // Note: cannot do append + compression. This is a limitation
+    // of ogzstream (or rather most compressed formats)
+
+    OFstream os
+    (
+        pathName,
+        IOstream::BINARY,
+        ver,
+        IOstream::UNCOMPRESSED, // no compression
+        append
+    );
+
+    if (!os.good())
+    {
+        FatalIOErrorInFunction(os)
+            << "Cannot open for appending"
+            << exit(FatalIOError);
+    }
+
+    if (proci == 0)
+    {
+        IOobject::writeBanner(os)
+            << "FoamFile\n{\n"
+            << "    version     " << os.version() << ";\n"
+            << "    format      " << os.format() << ";\n"
+            << "    class       " << decomposedBlockData::typeName
+            << ";\n"
+            << "    location    " << pathName << ";\n"
+            << "    object      " << pathName.name() << ";\n"
+            << "}" << nl;
+        IOobject::writeDivider(os) << nl;
+    }
+
+    // Write data
+    UList<char> slice
+    (
+        const_cast<char*>(buf.data()),
+        label(buf.size())
+    );
+    os << nl << "// Processor" << proci << nl << slice << nl;
+
+    return os.good();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileOperations::collatedFileOperation::collatedFileOperation
+(
+    const bool verbose
+)
+:
+    masterUncollatedFileOperation(false),
+    writer_(maxThreadFileBufferSize)
+{
+    if (verbose)
+    {
+        Info<< "I/O    : " << typeName
+            << " (maxThreadFileBufferSize " << maxThreadFileBufferSize
+            << ')' << endl;
+        if
+        (
+            regIOobject::fileModificationChecking
+         == regIOobject::inotifyMaster
+        )
+        {
+            WarningInFunction
+                << "Resetting fileModificationChecking to inotify" << endl;
+        }
+        if
+        (
+            regIOobject::fileModificationChecking
+         == regIOobject::timeStampMaster
+        )
+        {
+            WarningInFunction
+                << "Resetting fileModificationChecking to timeStamp" << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperations::collatedFileOperation::~collatedFileOperation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::fileName Foam::fileOperations::collatedFileOperation::objectPath
+(
+    const IOobject& io,
+    const word& typeName
+) const
+{
+    // Replacement for objectPath
+    if (io.time().processorCase())
+    {
+        return masterUncollatedFileOperation::objectPath
+        (
+            io,
+            fileOperation::PROCESSORSOBJECT,
+            io.instance()
+        );
+    }
+    else
+    {
+        return masterUncollatedFileOperation::objectPath
+        (
+            io,
+            fileOperation::OBJECT,
+            io.instance()
+        );
+    }
+}
+
+
+bool Foam::fileOperations::collatedFileOperation::writeObject
+(
+    const regIOobject& io,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    const Time& tm = io.time();
+    const fileName& inst = io.instance();
+
+    if (inst.isAbsolute() || !tm.processorCase())
+    {
+        mkDir(io.path());
+        fileName pathName(io.objectPath());
+
+        if (debug)
+        {
+            Pout<< "writeObject:"
+                << " : For object : " << io.name()
+                << " falling back to master-only output to " << io.path()
+                << endl;
+        }
+
+        masterOFstream os
+        (
+            pathName,
+            fmt,
+            ver,
+            cmp,
+            false,
+            valid
+        );
+
+        // If any of these fail, return (leave error handling to Ostream class)
+        if (!os.good())
+        {
+            return false;
+        }
+        if (!io.writeHeader(os))
+        {
+            return false;
+        }
+        // Write the data to the Ostream
+        if (!io.writeData(os))
+        {
+            return false;
+        }
+        IOobject::writeEndDivider(os);
+
+        return true;
+    }
+    else
+    {
+        // Construct the equivalent processors/ directory
+        fileName path(processorsPath(io, inst));
+
+        mkDir(path);
+        fileName pathName(path/io.name());
+
+        if (io.global())
+        {
+            if (debug)
+            {
+                Pout<< "writeObject:" << " : For global object : " << io.name()
+                    << " falling back to master-only output to " << pathName
+                    << endl;
+            }
+
+            masterOFstream os
+            (
+                pathName,
+                fmt,
+                ver,
+                cmp,
+                false,
+                valid
+            );
+
+            // If any of these fail, return (leave error handling to Ostream
+            // class)
+            if (!os.good())
+            {
+                return false;
+            }
+            if (!io.writeHeader(os))
+            {
+                return false;
+            }
+            // Write the data to the Ostream
+            if (!io.writeData(os))
+            {
+                return false;
+            }
+            IOobject::writeEndDivider(os);
+
+            return true;
+        }
+        else if (!Pstream::parRun())
+        {
+            // Special path for e.g. decomposePar. Append to
+            // processors/ file
+            if (debug)
+            {
+                Pout<< "writeObject:"
+                    << " : For object : " << io.name()
+                    << " appending to " << pathName << endl;
+            }
+
+            return appendObject(io, pathName, fmt, ver, cmp);
+        }
+        else
+        {
+            if (debug)
+            {
+                Pout<< "writeObject:"
+                    << " : For object : " << io.name()
+                    << " starting collating output to " << pathName << endl;
+            }
+
+            threadedCollatedOFstream os(writer_, pathName, fmt, ver, cmp);
+
+            // If any of these fail, return (leave error handling to Ostream
+            // class)
+            if (!os.good())
+            {
+                return false;
+            }
+            if (Pstream::master() && !io.writeHeader(os))
+            {
+                return false;
+            }
+            // Write the data to the Ostream
+            if (!io.writeData(os))
+            {
+                return false;
+            }
+            if (Pstream::master())
+            {
+                IOobject::writeEndDivider(os);
+            }
+
+            return true;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
new file mode 100644
index 000000000..49a19e673
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileOperations::collatedFileOperation
+
+Description
+    Version of masterUncollatedFileOperation that collates regIOobjects
+    into a container in the processors/ subdirectory.
+
+    Uses threading if maxThreadFileBufferSize > 0.
+
+See also
+    masterUncollatedFileOperation
+
+SourceFiles
+    collatedFileOperation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fileOperations_collatedFileOperation_H
+#define fileOperations_collatedFileOperation_H
+
+#include "masterUncollatedFileOperation.H"
+#include "OFstreamCollator.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileOperations
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class collatedFileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class collatedFileOperation
+:
+    public masterUncollatedFileOperation
+{
+    // Private data
+
+        //- Threaded writer
+        mutable OFstreamCollator writer_;
+
+
+   // Private Member Functions
+
+        //- Append to processors/ file
+        bool appendObject
+        (
+            const regIOobject& io,
+            const fileName& pathName,
+            IOstream::streamFormat fmt,
+            IOstream::versionNumber ver,
+            IOstream::compressionType cmp
+        ) const;
+
+
+public:
+
+        //- Runtime type information
+        TypeName("collated");
+
+
+    // Static data
+
+        //- Max size of thread buffer size. This is the overall size of
+        //  all files to be written. Starts blocking if not enough size.
+        //  Read as float to enable easy specificiation of large sizes.
+        static float maxThreadFileBufferSize;
+
+
+    // Constructors
+
+        //- Construct null
+        collatedFileOperation(const bool verbose);
+
+
+    //- Destructor
+    virtual ~collatedFileOperation();
+
+
+    // Member Functions
+
+        // (reg)IOobject functionality
+
+            //- Generate disk file name for object. Opposite of filePath.
+            virtual fileName objectPath
+            (
+                const IOobject& io,
+                const word& typeName
+            ) const;
+
+            //- Writes a regIOobject (so header, contents and divider).
+            //  Returns success state.
+            virtual bool writeObject
+            (
+                const regIOobject&,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileOperations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.C
new file mode 100644
index 000000000..df919680f
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "threadedCollatedOFstream.H"
+#include "decomposedBlockData.H"
+#include "OFstreamCollator.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::threadedCollatedOFstream::threadedCollatedOFstream
+(
+    OFstreamCollator& writer,
+    const fileName& pathName,
+    streamFormat format,
+    versionNumber version,
+    compressionType compression
+)
+:
+    OStringStream(format, version),
+    writer_(writer),
+    pathName_(pathName),
+    compression_(compression)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::threadedCollatedOFstream::~threadedCollatedOFstream()
+{
+    writer_.write
+    (
+        decomposedBlockData::typeName,
+        pathName_,
+        str(),
+        IOstream::BINARY,
+        version(),
+        compression_,
+        false                   // append
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
new file mode 100644
index 000000000..e296e1132
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::threadedCollatedOFstream
+
+Description
+    Master-only drop-in replacement for OFstream.
+
+SourceFiles
+    threadedCollatedOFstream.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef threadedCollatedOFstream_H
+#define threadedCollatedOFstream_H
+
+#include "OStringStream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class OFstreamCollator;
+
+/*---------------------------------------------------------------------------*\
+                  Class threadedCollatedOFstream Declaration
+\*---------------------------------------------------------------------------*/
+
+class threadedCollatedOFstream
+:
+    public OStringStream
+{
+    // Private data
+
+        OFstreamCollator& writer_;
+
+        const fileName pathName_;
+
+        const IOstream::compressionType compression_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct and set stream status
+        threadedCollatedOFstream
+        (
+            OFstreamCollator&,
+            const fileName& pathname,
+            streamFormat format=ASCII,
+            versionNumber version=currentVersion,
+            compressionType compression=UNCOMPRESSED
+        );
+
+
+    //- Destructor
+    ~threadedCollatedOFstream();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
new file mode 100644
index 000000000..5d65cf2e2
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -0,0 +1,666 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fileOperation.H"
+#include "uncollatedFileOperation.H"
+#include "regIOobject.H"
+#include "argList.H"
+#include "HashSet.H"
+#include "masterUncollatedFileOperation.H"
+#include "objectRegistry.H"
+#include "decomposedBlockData.H"
+#include "polyMesh.H"
+#include "registerSwitch.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+    autoPtr<fileOperation> fileOperation::fileHandlerPtr_;
+
+    defineTypeNameAndDebug(fileOperation, 0);
+    defineRunTimeSelectionTable(fileOperation, word);
+
+    class addArgsOptions
+    {
+        public:
+        addArgsOptions()
+        {
+            argList::addOption
+            (
+                "fileHandler",
+                "handler",
+                "override the fileHandler"
+            );
+        }
+    };
+
+    addArgsOptions intObj;
+
+    word fileOperation::defaultFileHandler
+    (
+        debug::optimisationSwitches().lookupOrAddDefault
+        (
+            "fileHandler",
+            //Foam::fileOperations::uncollatedFileOperation::typeName,
+            word("uncollated"),
+            false,
+            false
+        )
+    );
+
+    word fileOperation::processorsDir = "processors";
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::fileMonitor& Foam::fileOperation::monitor() const
+{
+    if (!monitorPtr_.valid())
+    {
+        monitorPtr_.reset
+        (
+            new fileMonitor
+            (
+                regIOobject::fileModificationChecking == IOobject::inotify
+             || regIOobject::fileModificationChecking == IOobject::inotifyMaster
+            )
+        );
+    }
+    return monitorPtr_();
+}
+
+
+Foam::instantList Foam::fileOperation::sortTimes
+(
+    const fileNameList& dirEntries,
+    const word& constantName
+)
+{
+    // Initialise instant list
+    instantList Times(dirEntries.size() + 1);
+    label nTimes = 0;
+
+    // Check for "constant"
+    bool haveConstant = false;
+    forAll(dirEntries, i)
+    {
+        if (dirEntries[i] == constantName)
+        {
+            Times[nTimes].value() = 0;
+            Times[nTimes].name() = dirEntries[i];
+            nTimes++;
+            haveConstant = true;
+            break;
+        }
+    }
+
+    // Read and parse all the entries in the directory
+    forAll(dirEntries, i)
+    {
+        //IStringStream timeStream(dirEntries[i]);
+        //token timeToken(timeStream);
+
+        //if (timeToken.isNumber() && timeStream.eof())
+        scalar timeValue;
+        if (readScalar(dirEntries[i].c_str(), timeValue))
+        {
+            Times[nTimes].value() = timeValue;
+            Times[nTimes].name() = dirEntries[i];
+            nTimes++;
+        }
+    }
+
+    // Reset the length of the times list
+    Times.setSize(nTimes);
+
+    if (haveConstant)
+    {
+        if (nTimes > 2)
+        {
+            std::sort(&Times[1], Times.end(), instant::less());
+        }
+    }
+    else if (nTimes > 1)
+    {
+        std::sort(&Times[0], Times.end(), instant::less());
+    }
+
+    return Times;
+}
+
+
+bool Foam::fileOperation::isFileOrDir(const bool isFile, const fileName& f)
+{
+    return
+        (isFile && Foam::isFile(f))
+     || (!isFile && Foam::isDir(f));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileOperation::fileOperation()
+{}
+
+
+Foam::autoPtr<Foam::fileOperation> Foam::fileOperation::New
+(
+    const word& type,
+    const bool verbose
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Constructing fileOperation" << endl;
+    }
+
+    wordConstructorTable::iterator cstrIter =
+        wordConstructorTablePtr_->find(type);
+
+    if (cstrIter == wordConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown fileOperation type "
+            << type << nl << nl
+            << "Valid fileOperation types are" << endl
+            << wordConstructorTablePtr_->sortedToc()
+            << abort(FatalError);
+    }
+
+    return autoPtr<fileOperation>(cstrIter()(verbose));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperation::~fileOperation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::fileName Foam::fileOperation::objectPath
+(
+    const IOobject& io,
+    const word& typeName
+) const
+{
+    return io.objectPath();
+}
+
+
+bool Foam::fileOperation::writeObject
+(
+    const regIOobject& io,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    if (valid)
+    {
+        fileName pathName(io.objectPath());
+
+        mkDir(pathName.path());
+
+        autoPtr<Ostream> osPtr
+        (
+            NewOFstream
+            (
+                pathName,
+                fmt,
+                ver,
+                cmp
+            )
+        );
+
+        if (!osPtr.valid())
+        {
+            return false;
+        }
+
+        Ostream& os = osPtr();
+
+        // If any of these fail, return (leave error handling to Ostream class)
+        if (!os.good())
+        {
+            return false;
+        }
+
+        if (!io.writeHeader(os))
+        {
+            return false;
+        }
+
+        // Write the data to the Ostream
+        if (!io.writeData(os))
+        {
+            return false;
+        }
+
+        IOobject::writeEndDivider(os);
+    }
+    return true;
+}
+
+
+//Foam::fileName Foam::fileOperation::objectPath(const fileName& fName) const
+//{
+//    return fName;
+//}
+
+
+Foam::fileName Foam::fileOperation::filePath(const fileName& fName) const
+{
+    fileName path;
+    fileName local;
+    label proci = fileOperations::masterUncollatedFileOperation::
+    splitProcessorPath
+    (
+        fName,
+        path,
+        local
+    );
+
+    fileName procsName(path/processorsDir/local);
+
+    // Give preference to processors variant
+    if (proci != -1 && exists(procsName))
+    {
+        return procsName;
+    }
+    else if (exists(fName))
+    {
+        return fName;
+    }
+    else
+    {
+        return fileName::null;
+    }
+}
+
+
+Foam::label Foam::fileOperation::addWatch(const fileName& fName) const
+{
+    return monitor().addWatch(fName);
+}
+
+
+bool Foam::fileOperation::removeWatch(const label watchIndex) const
+{
+    return monitor().removeWatch(watchIndex);
+}
+
+
+Foam::label Foam::fileOperation::findWatch
+(
+    const labelList& watchIndices,
+    const fileName& fName
+) const
+{
+    forAll(watchIndices, i)
+    {
+        if (getFile(watchIndices[i]) == fName)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+
+void Foam::fileOperation::addWatches
+(
+    regIOobject& rio,
+    const fileNameList& files
+) const
+{
+    const labelList& watchIndices = rio.watchIndices();
+
+    DynamicList<label> newWatchIndices;
+    labelHashSet removedWatches(watchIndices);
+
+    forAll(files, i)
+    {
+        const fileName& f = files[i];
+        label index = findWatch(watchIndices, f);
+
+        if (index == -1)
+        {
+            newWatchIndices.append(addWatch(f));
+        }
+        else
+        {
+            // Existing watch
+            newWatchIndices.append(watchIndices[index]);
+            removedWatches.erase(index);
+        }
+    }
+
+    // Remove any unused watches
+    forAllConstIter(labelHashSet, removedWatches, iter)
+    {
+        removeWatch(watchIndices[iter.key()]);
+    }
+
+    rio.watchIndices() = newWatchIndices;
+}
+
+
+Foam::fileName Foam::fileOperation::getFile(const label watchIndex) const
+{
+    return monitor().getFile(watchIndex);
+}
+
+
+void Foam::fileOperation::updateStates
+(
+    const bool masterOnly,
+    const bool syncPar
+) const
+{
+    monitor().updateStates(masterOnly, Pstream::parRun());
+}
+
+
+Foam::fileMonitor::fileState Foam::fileOperation::getState
+(
+    const label watchFd
+) const
+{
+    return monitor().getState(watchFd);
+}
+
+
+void Foam::fileOperation::setUnmodified(const label watchFd) const
+{
+    monitor().setUnmodified(watchFd);
+}
+
+
+Foam::instantList Foam::fileOperation::findTimes
+(
+    const fileName& directory,
+    const word& constantName
+) const
+{
+    if (debug)
+    {
+        Pout<< FUNCTION_NAME
+            << " : Finding times in directory " << directory << endl;
+    }
+
+    // Read directory entries into a list
+    fileNameList dirEntries
+    (
+        Foam::readDir
+        (
+            directory,
+            fileName::DIRECTORY
+        )
+    );
+
+    instantList times = sortTimes(dirEntries, constantName);
+
+    // Check if directory is processorXXX
+    fileName procsDir
+    (
+        fileOperations::masterUncollatedFileOperation::processorsPath
+        (
+            directory
+        )
+    );
+
+    if (!procsDir.empty() && procsDir != directory)
+    {
+        fileNameList extraEntries
+        (
+            Foam::readDir
+            (
+                procsDir,
+                fileName::DIRECTORY
+            )
+        );
+
+        instantList extraTimes = sortTimes(extraEntries, constantName);
+
+        if (extraTimes.size())
+        {
+            bool haveConstant =
+            (
+                times.size() > 0
+             && times[0].name() == constantName
+            );
+
+            bool haveExtraConstant =
+            (
+                extraTimes.size() > 0
+             && extraTimes[0].name() == constantName
+            );
+
+            // Combine times
+            instantList combinedTimes(times.size()+extraTimes.size());
+            label sz = 0;
+            label extrai = 0;
+            if (haveExtraConstant)
+            {
+                extrai = 1;
+                if (!haveConstant)
+                {
+                    combinedTimes[sz++] = extraTimes[0];    // constant
+                }
+            }
+            forAll(times, i)
+            {
+                combinedTimes[sz++] = times[i];
+            }
+            for (; extrai < extraTimes.size(); extrai++)
+            {
+                combinedTimes[sz++] = extraTimes[extrai];
+            }
+            combinedTimes.setSize(sz);
+            times.transfer(combinedTimes);
+
+            // Sort
+            if (times.size() > 1)
+            {
+                label starti = 0;
+                if (times[0].name() == constantName)
+                {
+                    starti = 1;
+                }
+                std::sort(&times[starti], times.end(), instant::less());
+
+                // Filter out duplicates
+                label newi = starti+1;
+                for (label i = newi; i < times.size(); i++)
+                {
+                    if (times[i].value() != times[i-1].value())
+                    {
+                        if (newi != i)
+                        {
+                            times[newi] = times[i];
+                        }
+                        newi++;
+                    }
+                }
+
+                times.setSize(newi);
+            }
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< FUNCTION_NAME
+            << " : Found times:" << times << endl;
+    }
+    return times;
+}
+
+
+Foam::fileNameList Foam::fileOperation::readObjects
+(
+    const objectRegistry& db,
+    const fileName& instance,
+    const fileName& local,
+    word& newInstance
+) const
+{
+    if (debug)
+    {
+        Pout<< "fileOperation::readObjects :"
+            << " db:" << db.objectPath()
+            << " instance:" << instance << endl;
+    }
+
+    fileName path(db.path(instance, db.dbDir()/local));
+
+    newInstance = word::null;
+    fileNameList objectNames;
+
+    if (Foam::isDir(path))
+    {
+        newInstance = instance;
+        objectNames = Foam::readDir(path, fileName::FILE);
+    }
+    else
+    {
+        // Get processors equivalent of path
+
+        fileName prefix;
+        fileName postfix;
+        label proci = fileOperations::masterUncollatedFileOperation::
+        splitProcessorPath
+        (
+            path,
+            prefix,
+            postfix
+        );
+        fileName procsPath(prefix/processorsDir/postfix);
+
+        if (proci != -1 && Foam::isDir(procsPath))
+        {
+            newInstance = instance;
+            objectNames = Foam::readDir(procsPath, fileName::FILE);
+        }
+    }
+    return objectNames;
+}
+
+
+Foam::label Foam::fileOperation::nProcs
+(
+    const fileName& dir,
+    const fileName& local
+) const
+{
+    if (Foam::isDir(dir/processorsDir))
+    {
+        fileName pointsFile
+        (
+            dir
+           /processorsDir
+           /"constant"
+           /local
+           /polyMesh::meshSubDir
+           /"points"
+        );
+
+        if (Foam::isFile(pointsFile))
+        {
+            return decomposedBlockData::numBlocks(pointsFile);
+        }
+        else
+        {
+            WarningInFunction << "Cannot read file " << pointsFile
+                << " to determine the number of decompositions."
+                << " Falling back to looking for processor.*" << endl;
+        }
+    }
+
+    label nProcs = 0;
+    while
+    (
+        isDir
+        (
+            dir
+           /(word("processor") + name(nProcs))
+           /"constant"
+           /local
+           /polyMesh::meshSubDir
+        )
+    )
+    {
+        ++nProcs;
+    }
+
+    return nProcs;
+}
+
+
+const Foam::fileOperation& Foam::fileHandler()
+{
+    if (!fileOperation::fileHandlerPtr_.valid())
+    {
+        word handler(getEnv("FOAM_FILEHANDLER"));
+
+        if (!handler.size())
+        {
+            handler = fileOperation::defaultFileHandler;
+        }
+
+        fileOperation::fileHandlerPtr_ = fileOperation::New(handler, true);
+    }
+    return fileOperation::fileHandlerPtr_();
+}
+
+
+void Foam::fileHandler(autoPtr<fileOperation>& newHandlerPtr)
+{
+    if (fileOperation::fileHandlerPtr_.valid())
+    {
+        if
+        (
+            newHandlerPtr.valid()
+         && newHandlerPtr->type() == fileOperation::fileHandlerPtr_->type()
+        )
+        {
+            return;
+        }
+    }
+    fileOperation::fileHandlerPtr_.clear();
+
+    if (newHandlerPtr.valid())
+    {
+        fileOperation::fileHandlerPtr_ = newHandlerPtr;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
new file mode 100644
index 000000000..ccd55b2fd
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -0,0 +1,431 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileOperation
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fileOperation_H
+#define fileOperation_H
+
+#include "ISstream.H"
+#include "Ostream.H"
+#include "autoPtr.H"
+#include "fileNameList.H"
+#include "instantList.H"
+#include "fileMonitor.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class IOobject;
+class regIOobject;
+class objectRegistry;
+class Time;
+
+/*---------------------------------------------------------------------------*\
+                         Class fileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class fileOperation
+{
+protected:
+
+    // Protected data
+
+        //- file-change monitor for all registered files
+        mutable autoPtr<fileMonitor> monitorPtr_;
+
+
+   // Protected Member Functions
+
+        fileMonitor& monitor() const;
+
+        //- Sort directory entries according to time value
+        static instantList sortTimes(const fileNameList&, const word&);
+
+        //- Helper: check for file (isFile) or directory (!isFile)
+        static bool isFileOrDir(const bool isFile, const fileName&);
+
+public:
+
+    // Static data
+
+        //- Return the processors directory name (usually "processors")
+        static word processorsDir;
+
+        //- Default fileHandler
+        static word defaultFileHandler;
+
+
+    // Public data types
+
+        //- Enumeration for the location of an IOobject
+        enum pathType
+        {
+            NOTFOUND,               // not found
+            ABSOLUTE,               // instance is absolute directory
+            OBJECT,                 // objectPath exists
+            PROCESSORSOBJECT,       // objectPath exists in processors/
+            PARENTOBJECT,           // parent of object path
+            FINDINSTANCE,           // file found in time directory
+            PROCESSORSFINDINSTANCE  // as above but in processors/
+        };
+
+
+        //- Runtime type information
+        TypeName("fileOperation");
+
+
+    //- Static fileOperation
+    static autoPtr<fileOperation> fileHandlerPtr_;
+
+
+    // Constructors
+
+        //- Construct null
+        fileOperation();
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            fileOperation,
+            word,
+            (
+                const bool verbose
+            ),
+            (verbose)
+        );
+
+
+    // Selectors
+
+        //- Select type
+        static autoPtr<fileOperation> New(const word& type, const bool verbose);
+
+
+    //- Destructor
+    virtual ~fileOperation();
+
+
+    // Member Functions
+
+        // OSSpecific equivalents
+
+            //- Make directory
+            virtual bool mkDir(const fileName&, mode_t=0777) const = 0;
+
+            //- Set the file mode
+            virtual bool chMod(const fileName&, const mode_t) const = 0;
+
+            //- Return the file mode
+            virtual mode_t mode
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Return the file type: DIRECTORY, FILE or LINK
+            virtual fileName::Type type
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Does the name exist (as DIRECTORY or FILE) in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool exists
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Does the name exist as a DIRECTORY in the file system?
+            virtual bool isDir
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Does the name exist as a FILE in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool isFile
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Return size of file
+            virtual off_t fileSize
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Return time of last file modification
+            virtual time_t lastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Return time of last file modification
+            virtual double highResLastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Read a directory and return the entries as a string list
+            virtual fileNameList readDir
+            (
+                const fileName&,
+                const fileName::Type=fileName::FILE,
+                const bool filtergz=true,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Copy, recursively if necessary, the source to the destination
+            virtual bool cp
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = true
+            ) const = 0;
+
+            //- Create a softlink. dst should not exist. Returns true if
+            //  successful.
+            virtual bool ln(const fileName& src, const fileName& dst) const = 0;
+
+            //- Rename src to dst
+            virtual bool mv
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = false
+            ) const = 0;
+
+            //- Rename to a corresponding backup file
+            //  If the backup file already exists, attempt with
+            //  "01" .. "99" suffix
+            virtual bool mvBak
+            (
+                const fileName&,
+                const std::string& ext = "bak"
+            ) const = 0;
+
+            //- Remove a file, returning true if successful otherwise false
+            virtual bool rm(const fileName&) const = 0;
+
+            //- Remove a dirctory and its contents
+            virtual bool rmDir(const fileName&) const = 0;
+
+//            //- Open a shared library. Return handle to library. Print error
+//            //  message if library cannot be loaded (check = true)
+//            virtual void* dlOpen
+//            (
+//                const fileName& lib,
+//                const bool check = true
+//            ) const = 0;
+
+
+        // (reg)IOobject functinality
+
+            //- Generate disk file name for object. Opposite of filePath.
+            //  Optional wanted typeName.
+            virtual fileName objectPath
+            (
+                const IOobject& io,
+                const word& typeName
+            ) const;
+
+            //- Search for an object. checkGlobal : also check undecomposed case
+            //  Optional wanted typeName.
+            virtual fileName filePath
+            (
+                const bool checkGlobal,
+                const IOobject&,
+                const word& typeName
+            ) const = 0;
+
+            //- Search for a directory. checkGlobal : also check undecomposed
+            //  case
+            virtual fileName dirPath
+            (
+                const bool checkGlobal,
+                const IOobject&
+            ) const = 0;
+
+            //- Search directory for objects. Used in IOobjectList.
+            virtual fileNameList readObjects
+            (
+                const objectRegistry& db,
+                const fileName& instance,
+                const fileName& local,
+                word& newInstance
+            ) const;
+
+            //- Read object header from supplied file
+            virtual bool readHeader
+            (
+                IOobject&,
+                const fileName&,
+                const word& typeName
+            ) const = 0;
+
+            //- Reads header for regIOobject and returns an ISstream
+            //  to read the contents.
+            virtual autoPtr<ISstream> readStream
+            (
+                regIOobject&,
+                const fileName&,
+                const word& typeName,
+                const bool valid = true
+            ) const = 0;
+
+            //- Top-level read
+            virtual bool read
+            (
+                regIOobject&,
+                const bool masterOnly,
+                const IOstream::streamFormat format,
+                const word& typeName
+            ) const = 0;
+
+            //- Writes a regIOobject (so header, contents and divider).
+            //  Returns success state. Default action is to write to
+            //  the objectPath using writeData. If !valid the
+            //  file does not need to be written (this is used e.g. to
+            //  suppress empty local lagrangian data)
+            virtual bool writeObject
+            (
+                const regIOobject&,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const;
+
+
+        // Filename (not IOobject) operations
+
+            //- Search for a file or directory. Use IOobject version in
+            //  preference
+            virtual fileName filePath(const fileName&) const;
+
+            //- Generate an ISstream that reads a file
+            virtual autoPtr<ISstream> NewIFstream(const fileName&) const = 0;
+
+            //- Generate an Ostream that writes a file
+            virtual autoPtr<Ostream> NewOFstream
+            (
+                const fileName& pathname,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const = 0;
+
+
+        // File modification checking
+
+            //- Add watching of a file. Returns handle
+            virtual label addWatch(const fileName&) const;
+
+            //- Remove watch on a file (using handle)
+            virtual bool removeWatch(const label) const;
+
+            //- Find index (or -1) of file in list of handles
+            virtual label findWatch
+            (
+                const labelList& watchIndices,
+                const fileName&
+            ) const;
+
+            //- Helper: add watches for list of regIOobjects
+            virtual void addWatches(regIOobject&, const fileNameList&) const;
+
+            //- Get name of file being watched (using handle)
+            virtual fileName getFile(const label) const;
+
+            //- Update state of all files
+            virtual void updateStates
+            (
+                const bool masterOnly,
+                const bool syncPar
+            ) const;
+
+            //- Get current state of file (using handle)
+            virtual fileMonitor::fileState getState(const label) const;
+
+            //- Set current state of file (using handle) to unmodified
+            virtual void setUnmodified(const label) const;
+
+
+        // Other
+
+            //- Get number of processor directories/results. Used for e.g.
+            //  reconstructPar, argList checking
+            virtual label nProcs
+            (
+                const fileName& dir,
+                const fileName& local = ""
+            ) const;
+
+            //- Get sorted list of times
+            virtual instantList findTimes(const fileName&, const word&) const;
+
+            //- Callback for time change
+            virtual void setTime(const Time&) const
+            {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Global declarations: defined in fileOperation.C
+
+//- Get current file handler
+const fileOperation& fileHandler();
+
+//- Reset file handler
+void fileHandler(autoPtr<fileOperation>&);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
new file mode 100644
index 000000000..fd4bf8e38
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -0,0 +1,1781 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "masterUncollatedFileOperation.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Pstream.H"
+#include "Time.H"
+#include "instant.H"
+#include "IFstream.H"
+#include "masterOFstream.H"
+#include "decomposedBlockData.H"
+#include "registerSwitch.H"
+#include "dummyISstream.H"
+#include "SubList.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+namespace fileOperations
+{
+    defineTypeNameAndDebug(masterUncollatedFileOperation, 0);
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        masterUncollatedFileOperation,
+        word
+    );
+
+    float masterUncollatedFileOperation::maxMasterFileBufferSize
+    (
+        Foam::debug::floatOptimisationSwitch("maxMasterFileBufferSize", 1e9)
+    );
+    registerOptSwitch
+    (
+        "maxMasterFileBufferSize",
+        float,
+        masterUncollatedFileOperation::maxMasterFileBufferSize
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::word
+Foam::fileOperations::masterUncollatedFileOperation::findInstancePath
+(
+    const instantList& timeDirs,
+    const instant& t
+)
+{
+    // Note:
+    // - times will include constant (with value 0) as first element.
+    //   For backwards compatibility make sure to find 0 in preference
+    //   to constant.
+    // - list is sorted so could use binary search
+
+    forAllReverse(timeDirs, i)
+    {
+        if (t.equal(timeDirs[i].value()))
+        {
+            return timeDirs[i].name();
+        }
+    }
+
+    return word::null;
+}
+
+
+Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
+(
+    const bool checkGlobal,
+    const bool isFile,
+    const IOobject& io,
+    pathType& searchType,
+    word& newInstancePath
+) const
+{
+    newInstancePath = word::null;
+
+    if (io.instance().isAbsolute())
+    {
+        fileName objectPath = io.instance()/io.name();
+
+        if (isFileOrDir(isFile, objectPath))
+        {
+            searchType = fileOperation::ABSOLUTE;
+            return objectPath;
+        }
+        else
+        {
+            searchType = fileOperation::NOTFOUND;
+            return fileName::null;
+        }
+    }
+    else
+    {
+        // 1. Check processors/
+        if (io.time().processorCase())
+        {
+            fileName objectPath = processorsPath(io, io.instance())/io.name();
+            if (isFileOrDir(isFile, objectPath))
+            {
+                searchType = fileOperation::PROCESSORSOBJECT;
+                return objectPath;
+            }
+        }
+        {
+            // 2. Check local
+            fileName localObjectPath = io.objectPath();
+
+            if (isFileOrDir(isFile, localObjectPath))
+            {
+                searchType = fileOperation::OBJECT;
+                return localObjectPath;
+            }
+        }
+
+
+
+        // Any global checks
+        if
+        (
+            checkGlobal
+         && io.time().processorCase()
+         && (
+                io.instance() == io.time().system()
+             || io.instance() == io.time().constant()
+            )
+        )
+        {
+            fileName parentObjectPath =
+                io.rootPath()/io.time().globalCaseName()
+               /io.instance()/io.db().dbDir()/io.local()/io.name();
+
+            if (isFileOrDir(isFile, parentObjectPath))
+            {
+                searchType = fileOperation::PARENTOBJECT;
+                return parentObjectPath;
+            }
+        }
+
+       // Check for approximately same time. E.g. if time = 1e-2 and
+       // directory is 0.01 (due to different time formats)
+       HashPtrTable<instantList>::const_iterator pathFnd
+        (
+            times_.find
+            (
+                io.time().path()
+            )
+        );
+       if (pathFnd != times_.end())
+       {
+           newInstancePath = findInstancePath
+           (
+               *pathFnd(),
+               instant(io.instance())
+           );
+
+           if (newInstancePath.size())
+           {
+               // 1. Try processors equivalent
+
+               fileName fName =
+                   processorsPath(io, newInstancePath)
+                  /io.name();
+               if (isFileOrDir(isFile, fName))
+               {
+                   searchType = fileOperation::PROCESSORSFINDINSTANCE;
+                   return fName;
+               }
+
+               fName =
+                   io.rootPath()/io.caseName()
+                  /newInstancePath/io.db().dbDir()/io.local()/io.name();
+
+               if (isFileOrDir(isFile, fName))
+               {
+                   searchType = fileOperation::FINDINSTANCE;
+                   return fName;
+               }
+           }
+       }
+
+        searchType = fileOperation::NOTFOUND;
+        return fileName::null;
+    }
+}
+
+
+Foam::fileName
+Foam::fileOperations::masterUncollatedFileOperation::processorsCasePath
+(
+    const IOobject& io
+)
+{
+    return
+        io.rootPath()
+       /io.time().globalCaseName()
+       /processorsDir;
+}
+
+
+Foam::fileName
+Foam::fileOperations::masterUncollatedFileOperation::processorsPath
+(
+    const IOobject& io,
+    const word& instance
+)
+{
+    return
+        processorsCasePath(io)
+       /instance
+       /io.db().dbDir()
+       /io.local();
+}
+
+
+Foam::fileName
+Foam::fileOperations::masterUncollatedFileOperation::processorsPath
+(
+    const fileName& dir
+)
+{
+    // Check if directory is processorXXX
+    word caseName(dir.name());
+
+    std::string::size_type pos = caseName.find("processor");
+    if (pos == 0)
+    {
+        return dir.path()/processorsDir;
+    }
+    else
+    {
+        return fileName::null;
+    }
+}
+
+
+Foam::label
+Foam::fileOperations::masterUncollatedFileOperation::splitProcessorPath
+(
+    const fileName& objectPath,
+    fileName& path,
+    fileName& local
+)
+{
+    // Search for processor at start of line or /processor
+    std::string::size_type pos = objectPath.find("processor");
+    if (pos == string::npos)
+    {
+        return -1;
+    }
+
+    if (pos == 0)
+    {
+        path = "";
+        local = objectPath.substr(pos+9);
+    }
+    else if (objectPath[pos-1] != '/')
+    {
+        return -1;
+    }
+    else
+    {
+        path = objectPath.substr(0, pos-1);
+        local = objectPath.substr(pos+9);
+    }
+
+    pos = local.find('/');
+    if (pos == string::npos)
+    {
+        // processorXXX without local
+        label proci;
+        if (Foam::read(local.c_str(), proci))
+        {
+            local.clear();
+            return proci;
+        }
+        return -1;
+    }
+    string procName(local.substr(0, pos));
+    label proci;
+    if (Foam::read(procName.c_str(), proci))
+    {
+        local = local.substr(pos+1);
+        return proci;
+    }
+    return -1;
+}
+
+
+Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::objectPath
+(
+    const IOobject& io,
+    const pathType& searchType,
+    const word& instancePath
+)
+{
+    // Replacement for IOobject::objectPath()
+
+    switch (searchType)
+    {
+        case fileOperation::ABSOLUTE:
+        {
+            return io.instance()/io.name();
+        }
+        break;
+
+        case fileOperation::OBJECT:
+        {
+            return io.path()/io.name();
+        }
+        break;
+
+        case fileOperation::PROCESSORSOBJECT:
+        {
+            return processorsPath(io, io.instance())/io.name();
+        }
+        break;
+
+        case fileOperation::PARENTOBJECT:
+        {
+            return
+                io.rootPath()/io.time().globalCaseName()
+               /io.instance()/io.db().dbDir()/io.local()/io.name();
+        }
+        break;
+
+        case fileOperation::FINDINSTANCE:
+        {
+            return
+                io.rootPath()/io.caseName()
+               /instancePath/io.db().dbDir()/io.local()/io.name();
+        }
+        break;
+
+        case fileOperation::PROCESSORSFINDINSTANCE:
+        {
+            return processorsPath(io, instancePath)/io.name();
+        }
+        break;
+
+        case fileOperation::NOTFOUND:
+        {
+            return fileName::null;
+        }
+        break;
+
+        default:
+        {
+            NotImplemented;
+            return fileName::null;
+        }
+    }
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::uniformFile
+(
+    const fileNameList& filePaths
+)
+{
+    const fileName& object0 = filePaths[0];
+
+    for (label i = 1; i < filePaths.size(); i++)
+    {
+        if (filePaths[i] != object0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+void Foam::fileOperations::masterUncollatedFileOperation::readAndSend
+(
+    const fileName& filePath,
+    const IOstream::compressionType cmp,
+    const labelUList& procs,
+    PstreamBuffers& pBufs
+)
+{
+    if (cmp == IOstream::compressionType::COMPRESSED)
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::readAndSend:"
+                << " opening compressed " << filePath << endl;
+        }
+
+        IFstream is(filePath, IOstream::streamFormat::BINARY);
+
+        std::ostringstream stringStr;
+        stringStr << is.stdStream().rdbuf();
+        string buf(stringStr.str());
+
+        forAll(procs, i)
+        {
+            UOPstream os(procs[i], pBufs);
+            os.write(&buf[0], buf.size());
+        }
+    }
+    else
+    {
+        off_t count(Foam::fileSize(filePath));
+        IFstream is(filePath, IOstream::streamFormat::BINARY);
+
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::readStream:"
+                << " From " << filePath <<  " reading " << label(count)
+                << " bytes" << endl;
+        }
+        List<char> buf(static_cast<label>(count));
+        is.stdStream().read(buf.begin(), count);
+
+        forAll(procs, i)
+        {
+            UOPstream os(procs[i], pBufs);
+            os.write(buf.begin(), count);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileOperations::masterUncollatedFileOperation::
+masterUncollatedFileOperation
+(
+    const bool verbose
+)
+{
+    if (verbose)
+    {
+        Info<< "I/O    : " << typeName
+            << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')' << endl;
+    }
+
+    if (regIOobject::fileModificationChecking == regIOobject::timeStampMaster)
+    {
+        if (verbose)
+        {
+            WarningInFunction
+                << "Resetting fileModificationChecking to timeStamp" << endl;
+        }
+        regIOobject::fileModificationChecking = regIOobject::timeStamp;
+    }
+    else if
+    (
+        regIOobject::fileModificationChecking
+     == regIOobject::inotifyMaster
+    )
+    {
+        if (verbose)
+        {
+            WarningInFunction
+                << "Resetting fileModificationChecking to inotify"
+                << endl;
+        }
+        regIOobject::fileModificationChecking = regIOobject::inotify;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperations::masterUncollatedFileOperation::
+~masterUncollatedFileOperation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::fileOperations::masterUncollatedFileOperation::mkDir
+(
+    const fileName& dir,
+    mode_t mode
+) const
+{
+    return masterOp<mode_t, mkDirOp>(dir, mkDirOp(mode));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::chMod
+(
+    const fileName& fName,
+    mode_t mode
+) const
+{
+    return masterOp<mode_t, chModOp>(fName, chModOp(mode));
+}
+
+
+mode_t Foam::fileOperations::masterUncollatedFileOperation::mode
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return masterOp<mode_t, modeOp>(fName, modeOp(followLink));
+}
+
+
+Foam::fileName::Type Foam::fileOperations::masterUncollatedFileOperation::type
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return fileName::Type(masterOp<label, typeOp>(fName, typeOp(followLink)));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::exists
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    return masterOp<bool, existsOp>(fName, existsOp(checkGzip, followLink));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::isDir
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return masterOp<bool, isDirOp>(fName, isDirOp(followLink));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::isFile
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    return masterOp<bool, isFileOp>(fName, isFileOp(checkGzip, followLink));
+}
+
+
+off_t Foam::fileOperations::masterUncollatedFileOperation::fileSize
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return masterOp<off_t, fileSizeOp>(fName, fileSizeOp(followLink));
+}
+
+
+time_t Foam::fileOperations::masterUncollatedFileOperation::lastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return masterOp<time_t, lastModifiedOp>
+    (
+        fName,
+        lastModifiedOp(followLink)
+    );
+}
+
+
+double Foam::fileOperations::masterUncollatedFileOperation::highResLastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return masterOp<double, lastModifiedHROp>
+    (
+        fName,
+        lastModifiedHROp(followLink)
+    );
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::mvBak
+(
+    const fileName& fName,
+    const std::string& ext
+) const
+{
+    return masterOp<bool, mvBakOp>(fName, mvBakOp(ext));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::rm
+(
+    const fileName& fName
+) const
+{
+    return masterOp<bool, rmOp>(fName, rmOp());
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::rmDir
+(
+    const fileName& dir
+) const
+{
+    return masterOp<bool, rmDirOp>(dir, rmDirOp());
+}
+
+
+Foam::fileNameList Foam::fileOperations::masterUncollatedFileOperation::readDir
+(
+    const fileName& dir,
+    const fileName::Type type,
+    const bool filtergz,
+    const bool followLink
+) const
+{
+    return masterOp<fileNameList, readDirOp>
+    (
+        dir,
+        readDirOp(type, filtergz, followLink)
+    );
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::cp
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    return masterOp<bool, cpOp>(src, dst, cpOp(followLink));
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::ln
+(
+    const fileName& src,
+    const fileName& dst
+) const
+{
+    return masterOp<bool, lnOp>(src, dst, lnOp());
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::mv
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    return masterOp<bool, mvOp>(src, dst, mvOp(followLink));
+}
+
+
+Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
+(
+    const bool checkGlobal,
+    const IOobject& io,
+    const word& typeName
+) const
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::filePath :"
+            << " objectPath:" << io.objectPath()
+            << " checkGlobal:" << checkGlobal << endl;
+    }
+
+    // Trigger caching of times
+    (void)findTimes(io.time().path(), io.time().constant());
+
+    // Determine master filePath and scatter
+
+    fileName objPath;
+    pathType searchType;
+    word newInstancePath;
+    if (Pstream::master())
+    {
+        objPath = filePath(checkGlobal, true, io, searchType, newInstancePath);
+    }
+    {
+        label masterType(searchType);
+        Pstream::scatter(masterType);
+        searchType = pathType(masterType);
+    }
+    Pstream::scatter(newInstancePath);
+
+
+    // Use the master type to determine if additional information is
+    // needed to construct the local equivalent
+    switch (searchType)
+    {
+        case fileOperation::ABSOLUTE:
+        case fileOperation::PROCESSORSOBJECT:
+        case fileOperation::PARENTOBJECT:
+        case fileOperation::FINDINSTANCE:
+        case fileOperation::PROCESSORSFINDINSTANCE:
+        {
+            // Construct equivalent local path
+            objPath = objectPath(io, searchType, newInstancePath);
+        }
+        break;
+
+        case fileOperation::OBJECT:
+        case fileOperation::NOTFOUND:
+        {
+            // Retest all processors separately since some processors might
+            // have the file and some not (e.g. lagrangian data)
+            objPath = masterOp<fileName, fileOrNullOp>
+            (
+                io.objectPath(),
+                fileOrNullOp(true)
+            );
+        }
+        break;
+    }
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::filePath :"
+            << " Returning from file searching:" << endl
+            << "    objectPath:" << io.objectPath() << endl
+            << "    filePath  :" << objPath << endl << endl;
+    }
+    return objPath;
+}
+
+
+Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
+(
+    const bool checkGlobal,
+    const IOobject& io
+) const
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::dirPath :"
+            << " objectPath:" << io.objectPath()
+            << " checkGlobal:" << checkGlobal << endl;
+    }
+
+    // Determine master dirPath and scatter
+
+    fileName objPath;
+    pathType searchType;
+    word newInstancePath;
+    if (Pstream::master())
+    {
+        objPath = filePath(checkGlobal, false, io, searchType, newInstancePath);
+    }
+    {
+        label masterType(searchType);
+        Pstream::scatter(masterType);
+        searchType = pathType(masterType);
+    }
+    Pstream::scatter(newInstancePath);
+
+
+    // Use the master type to determine if additional information is
+    // needed to construct the local equivalent
+    switch (searchType)
+    {
+        case fileOperation::ABSOLUTE:
+        case fileOperation::PROCESSORSOBJECT:
+        case fileOperation::PARENTOBJECT:
+        case fileOperation::FINDINSTANCE:
+        case fileOperation::PROCESSORSFINDINSTANCE:
+        {
+            // Construct equivalent local path
+            objPath = objectPath(io, searchType, newInstancePath);
+        }
+        break;
+
+        case fileOperation::OBJECT:
+        case fileOperation::NOTFOUND:
+        {
+            // Retest all processors separately since some processors might
+            // have the file and some not (e.g. lagrangian data)
+            objPath = masterOp<fileName, fileOrNullOp>
+            (
+                io.objectPath(),
+                fileOrNullOp(false)
+            );
+        }
+        break;
+    }
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::dirPath :"
+            << " Returning from file searching:" << endl
+            << "    objectPath:" << io.objectPath() << endl
+            << "    filePath  :" << objPath << endl << endl;
+    }
+    return objPath;
+}
+
+
+Foam::fileNameList
+Foam::fileOperations::masterUncollatedFileOperation::readObjects
+(
+    const objectRegistry& db,
+    const fileName& instance,
+    const fileName& local,
+    word& newInstance
+) const
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::readObjects :"
+            << " db:" << db.objectPath()
+            << " instance:" << instance << endl;
+    }
+
+    fileNameList objectNames;
+    newInstance = word::null;
+
+    if (Pstream::master())
+    {
+        //- Use non-time searching version
+        objectNames = fileOperation::readObjects
+        (
+            db,
+            instance,
+            local,
+            newInstance
+        );
+
+        if (newInstance.empty())
+        {
+            // Find similar time
+
+            // Copy of Time::findInstancePath. We want to avoid the
+            // parallel call to findTimes. Alternative is to have
+            // version of findInstancePath that takes instantList ...
+            const instantList timeDirs
+            (
+                fileOperation::findTimes
+                (
+                    db.time().path(),
+                    db.time().constant()
+                )
+            );
+
+            const instant t(instance);
+            forAllReverse(timeDirs, i)
+            {
+                if (t.equal(timeDirs[i].value()))
+                {
+                    objectNames = fileOperation::readObjects
+                    (
+                        db,
+                        timeDirs[i].name(),     // newly found time
+                        local,
+                        newInstance
+                    );
+                    break;
+                }
+            }
+        }
+    }
+
+    Pstream::scatter(newInstance);
+    Pstream::scatter(objectNames);
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::readObjects :"
+            << " newInstance:" << newInstance
+            << " objectNames:" << objectNames << endl;
+    }
+
+    return objectNames;
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::readHeader
+(
+    IOobject& io,
+    const fileName& fName,
+    const word& typeName
+) const
+{
+    bool ok = false;
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::readHeader:" << endl
+            << "    objectPath:" << io.objectPath() << endl
+            << "    fName     :" << fName << endl;
+    }
+
+    fileNameList filePaths(Pstream::nProcs());
+    filePaths[Pstream::myProcNo()] = fName;
+    Pstream::gatherList(filePaths);
+
+    bool uniform = uniformFile(filePaths);
+    Pstream::scatter(uniform);
+
+    if (uniform)
+    {
+        if (Pstream::master())
+        {
+            if (!fName.empty())
+            {
+                IFstream is(fName);
+
+                if (is.good())
+                {
+                    ok = io.readHeader(is);
+
+                    if (io.headerClassName() == decomposedBlockData::typeName)
+                    {
+                        // Read the header inside the container (master data)
+                        ok = decomposedBlockData::readMasterHeader(io, is);
+                    }
+                }
+            }
+        }
+        Pstream::scatter(ok);
+        Pstream::scatter(io.headerClassName());
+        Pstream::scatter(io.note());
+    }
+    else
+    {
+        boolList result(Pstream::nProcs(), false);
+        wordList headerClassName(Pstream::nProcs());
+        stringList note(Pstream::nProcs());
+        if (Pstream::master())
+        {
+            forAll(filePaths, proci)
+            {
+                if (!filePaths[proci].empty())
+                {
+                    IFstream is(filePaths[proci]);
+
+                    if (is.good())
+                    {
+                        result[proci] = io.readHeader(is);
+                        headerClassName[proci] = io.headerClassName();
+                        note[proci] = io.note();
+
+                        if
+                        (
+                            io.headerClassName()
+                         == decomposedBlockData::typeName
+                        )
+                        {
+                            FatalErrorInFunction
+                                << "Unexpected decomposedBlockData container"
+                                << " for processor " << proci
+                                << " file:" << filePaths[proci]
+                                << ". A decomposedBlockData container should"
+                                << " produce the same file name on all"
+                                << " processors" << exit(FatalError);
+                        }
+                    }
+                }
+            }
+        }
+        ok = scatterList(result);
+        io.headerClassName() = scatterList(headerClassName);
+        io.note() = scatterList(note);
+    }
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::readHeader:" << " ok:" << ok
+            << " class:" << io.headerClassName() << endl;
+    }
+    return ok;
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::masterUncollatedFileOperation::readStream
+(
+    regIOobject& io,
+    const fileName& fName,
+    const word& typeName,
+    const bool valid
+) const
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::readStream:"
+            << " object : " << io.name()
+            << " fName : " << fName << " valid:" << valid << endl;
+    }
+
+
+    autoPtr<ISstream> isPtr;
+    bool isCollated = false;
+    if (UPstream::master())
+    {
+        if (!fName.empty())
+        {
+            // This can happen in lagrangian field reading some processors
+            // have no file to read from. This will only happen when using
+            // normal writing since then the fName for the valid processors is
+            // processorDDD/<instance>/.. . In case of collocated writing
+            // the fName is already rewritten to processors/.
+
+            isPtr.reset(new IFstream(fName));
+
+            if (isPtr().good())
+            {
+                // Read header data (on copy)
+                IOobject headerIO(io);
+                headerIO.readHeader(isPtr());
+
+                if (headerIO.headerClassName() == decomposedBlockData::typeName)
+                {
+                    isCollated = true;
+                }
+            }
+
+            if (!isCollated)
+            {
+                // Close file. Reopened below.
+                isPtr.clear();
+            }
+        }
+    }
+
+    Pstream::scatter(isCollated);
+
+    if (isCollated)
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::readStream:"
+                << " for object : " << io.name()
+                << " starting collating input from " << fName << endl;
+        }
+
+        List<char> data;
+        if (!Pstream::parRun())
+        {
+            // Analyse the objectpath to find out the processor we're trying
+            // to access
+            fileName path;
+            fileName local;
+            label proci = fileOperations::masterUncollatedFileOperation::
+            splitProcessorPath
+            (
+                io.objectPath(),
+                path,
+                local
+            );
+
+            if (proci == -1)
+            {
+                FatalIOErrorInFunction(isPtr())
+                    << "Could not detect processor number"
+                    << " from objectPath:" << io.objectPath()
+                    << exit(FatalIOError);
+            }
+
+            return decomposedBlockData::readBlock(proci, isPtr(), io);
+        }
+        else
+        {
+            // Get size of file (on master, scatter to slaves)
+            off_t sz = fileSize(fName);
+
+            // Read my data
+            return decomposedBlockData::readBlocks
+            (
+                UPstream::worldComm,
+                fName,
+                isPtr,
+                io,
+                (
+                    sz > off_t(maxMasterFileBufferSize)
+                  ? UPstream::commsTypes::scheduled
+                  : UPstream::commsTypes::nonBlocking
+                )
+            );
+        }
+    }
+    else
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::readStream:"
+                << " for object : " << io.name()
+                << " starting separated input from " << fName << endl;
+        }
+
+        fileNameList filePaths(Pstream::nProcs());
+        filePaths[Pstream::myProcNo()] = fName;
+        Pstream::gatherList(filePaths);
+        boolList procValid(Pstream::nProcs());
+        procValid[Pstream::myProcNo()] = valid;
+        Pstream::gatherList(procValid);
+
+        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+
+        if (Pstream::master())
+        {
+            //const bool uniform = uniformFile(filePaths);
+
+            if (valid)
+            {
+                if (fName.empty())
+                {
+                    FatalErrorInFunction
+                        << "cannot find file " << io.objectPath()
+                        << exit(FatalError);
+                }
+                else
+                {
+                    autoPtr<IFstream> ifsPtr(new IFstream(fName));
+
+                    // Read header
+                    if (!io.readHeader(ifsPtr()))
+                    {
+                        FatalIOErrorInFunction(ifsPtr())
+                            << "problem while reading header for object "
+                            << io.name() << exit(FatalIOError);
+                    }
+
+                    // Open master (steal from ifsPtr)
+                    isPtr.reset(ifsPtr.ptr());
+                }
+            }
+
+            // Read slave files
+            for (label proci = 1; proci < Pstream::nProcs(); proci++)
+            {
+                if (debug)
+                {
+                    Pout<< "masterUncollatedFileOperation::readStream:"
+                        << " For processor " << proci
+                        << " opening " << filePaths[proci] << endl;
+                }
+
+                if (procValid[proci] && !filePaths[proci].empty())
+                {
+                    // Note: handle compression ourselves since size cannot
+                    // be determined without actually uncompressing
+
+                    if (Foam::exists(filePaths[proci]+".gz", false))
+                    {
+                        readAndSend
+                        (
+                            filePaths[proci],
+                            IOstream::compressionType::COMPRESSED,
+                            labelList(1, proci),
+                            pBufs
+                        );
+                    }
+                    else
+                    {
+                        readAndSend
+                        (
+                            filePaths[proci],
+                            IOstream::compressionType::UNCOMPRESSED,
+                            labelList(1, proci),
+                            pBufs
+                        );
+                    }
+                }
+            }
+        }
+
+        labelList recvSizes;
+        pBufs.finishedSends(recvSizes);
+
+        // isPtr will be valid on master. Else the information is in the
+        // PstreamBuffers
+
+        if (Pstream::master())
+        {
+            if (!isPtr.valid())
+            {
+                return autoPtr<ISstream>(new dummyISstream());
+            }
+            else
+            {
+                return isPtr;
+            }
+        }
+        else
+        {
+            if (valid)
+            {
+                UIPstream is(Pstream::masterNo(), pBufs);
+                string buf(recvSizes[Pstream::masterNo()], '\0');
+                if (recvSizes[Pstream::masterNo()] > 0)
+                {
+                    is.read(&buf[0], recvSizes[Pstream::masterNo()]);
+                }
+
+                if (debug)
+                {
+                    Pout<< "masterUncollatedFileOperation::readStream:"
+                        << " Done reading " << buf.size() << " bytes" << endl;
+                }
+                isPtr.reset(new IStringStream(fName, buf));
+
+                if (!io.readHeader(isPtr()))
+                {
+                    FatalIOErrorInFunction(isPtr())
+                        << "problem while reading header for object "
+                        << io.name() << exit(FatalIOError);
+                }
+
+                return isPtr;
+            }
+            else
+            {
+                return autoPtr<ISstream>(new dummyISstream());
+            }
+        }
+    }
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::read
+(
+    regIOobject& io,
+    const bool masterOnly,
+    const IOstream::streamFormat format,
+    const word& typeName
+) const
+{
+    bool ok = true;
+
+    if (io.globalObject())
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::read:"
+                << "reading global object " << io.name() << endl;
+        }
+
+        bool ok = false;
+        if (Pstream::master())
+        {
+            // Do master-only reading always.
+            bool oldParRun = UPstream::parRun();
+            UPstream::parRun() = false;
+
+            ok = io.readData(io.readStream(typeName));
+            io.close();
+
+            UPstream::parRun() = oldParRun;
+        }
+
+        Pstream::scatter(ok);
+        Pstream::scatter(io.headerClassName());
+        Pstream::scatter(io.note());
+
+
+        // scatter operation for regIOobjects
+
+        // Get my communication order
+        const List<Pstream::commsStruct>& comms =
+        (
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+          ? Pstream::linearCommunication()
+          : Pstream::treeCommunication()
+        );
+        const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
+
+        // Reveive from up
+        if (myComm.above() != -1)
+        {
+            IPstream fromAbove
+            (
+                Pstream::commsTypes::scheduled,
+                myComm.above(),
+                0,
+                Pstream::msgType(),
+                Pstream::worldComm,
+                format
+            );
+            ok = io.readData(fromAbove);
+        }
+
+        // Send to my downstairs neighbours
+        forAll(myComm.below(), belowI)
+        {
+            OPstream toBelow
+            (
+                Pstream::commsTypes::scheduled,
+                myComm.below()[belowI],
+                0,
+                Pstream::msgType(),
+                Pstream::worldComm,
+                format
+            );
+            bool okWrite = io.writeData(toBelow);
+            ok = ok && okWrite;
+        }
+    }
+    else
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::read:"
+                << "reading local object " << io.name() << endl;
+        }
+
+        ok = io.readData(io.readStream(typeName));
+        io.close();
+    }
+
+    return ok;
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::writeObject
+(
+    const regIOobject& io,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    fileName pathName(io.objectPath());
+
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::writeObject:"
+            << " io:" << pathName << " valid:" << valid << endl;
+    }
+
+    // Make sure to pick up any new times
+    setTime(io.time());
+
+    autoPtr<Ostream> osPtr
+    (
+        NewOFstream
+        (
+            pathName,
+            fmt,
+            ver,
+            cmp,
+            valid
+        )
+    );
+    Ostream& os = osPtr();
+
+    // If any of these fail, return (leave error handling to Ostream class)
+    if (!os.good())
+    {
+        return false;
+    }
+
+    if (!io.writeHeader(os))
+    {
+        return false;
+    }
+
+    // Write the data to the Ostream
+    if (!io.writeData(os))
+    {
+        return false;
+    }
+
+    IOobject::writeEndDivider(os);
+
+    return true;
+}
+
+
+Foam::instantList Foam::fileOperations::masterUncollatedFileOperation::findTimes
+(
+    const fileName& directory,
+    const word& constantName
+) const
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::findTimes:"
+            << " Finding times in directory " << directory << endl;
+    }
+
+    HashPtrTable<instantList>::const_iterator iter = times_.find(directory);
+    if (iter != times_.end())
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::findTimes:"
+                << " Found cached times:" << *iter() << endl;
+        }
+        return *iter();
+    }
+    else
+    {
+        instantList times;
+        if (Pstream::master())
+        {
+            times = fileOperation::findTimes(directory, constantName);
+        }
+        Pstream::scatter(times);
+
+        instantList* tPtr = new instantList(times.xfer());
+
+        times_.insert(directory, tPtr);
+
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::findTimes:"
+                << " Caching times:" << *tPtr << endl;
+        }
+        return *tPtr;
+    }
+}
+
+
+void Foam::fileOperations::masterUncollatedFileOperation::setTime
+(
+    const Time& tm
+) const
+{
+    HashPtrTable<instantList>::const_iterator iter = times_.find(tm.path());
+    if (iter != times_.end())
+    {
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::setTime:"
+                << " Caching time " << tm.timeName()
+                << " for case:" << tm.path() << endl;
+        }
+
+        instantList& times = *iter();
+        const instant timeNow(tm.value(), tm.timeName());
+
+        if (times.size() > 0 && times[0].name() == tm.constant())
+        {
+            // Exclude constant
+            SubList<instant> realTimes(times, times.size()-1, 1);
+            if
+            (
+                findSortedIndex
+                (
+                    SubList<instant>(times, times.size()-1, 1),
+                    timeNow
+                )
+             == -1
+            )
+            {
+                times.append(timeNow);
+                SubList<instant> realTimes(times, times.size()-1, 1);
+                Foam::stableSort(realTimes);
+            }
+        }
+        else
+        {
+            if (findSortedIndex(times, timeNow) == -1)
+            {
+                times.append(timeNow);
+                Foam::stableSort(times);
+            }
+        }
+    }
+    fileOperation::setTime(tm);
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
+(
+    const fileName& filePath
+) const
+{
+    if (Pstream::parRun())
+    {
+        // Insert logic of filePath. We assume that if a file is absolute
+        // on the master it is absolute also on the slaves etc.
+
+        fileNameList filePaths(Pstream::nProcs());
+        filePaths[Pstream::myProcNo()] = filePath;
+        Pstream::gatherList(filePaths);
+
+        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+
+        if (Pstream::master())
+        {
+            const bool uniform = uniformFile(filePaths);
+
+            if (uniform)
+            {
+                if (debug)
+                {
+                    Pout<< "masterUncollatedFileOperation::NewIFstream:"
+                        << " Opening global file " << filePath << endl;
+                }
+
+                IOstream::compressionType cmp
+                (
+                    Foam::exists(filePath+".gz", false)
+                  ? IOstream::compressionType::COMPRESSED
+                  : IOstream::compressionType::UNCOMPRESSED
+                );
+
+                labelList procs(Pstream::nProcs()-1);
+                for (label proci = 1; proci < Pstream::nProcs(); proci++)
+                {
+                    procs[proci-1] = proci;
+                }
+
+                readAndSend(filePath, cmp, procs, pBufs);
+            }
+            else
+            {
+                for (label proci = 1; proci < Pstream::nProcs(); proci++)
+                {
+                    IOstream::compressionType cmp
+                    (
+                        Foam::exists(filePaths[proci]+".gz", false)
+                      ? IOstream::compressionType::COMPRESSED
+                      : IOstream::compressionType::UNCOMPRESSED
+                    );
+
+                    readAndSend
+                    (
+                        filePaths[proci],
+                        cmp,
+                        labelList(1, proci),
+                        pBufs
+                    );
+                }
+            }
+        }
+
+
+        labelList recvSizes;
+        pBufs.finishedSends(recvSizes);
+
+        if (Pstream::master())
+        {
+            // Read myself
+            return autoPtr<ISstream>
+            (
+                new IFstream(filePaths[Pstream::masterNo()])
+            );
+        }
+        else
+        {
+            if (debug)
+            {
+                Pout<< "masterUncollatedFileOperation::NewIFstream:"
+                    << " Reading " << filePath
+                    << " from processor " << Pstream::masterNo() << endl;
+            }
+
+            UIPstream is(Pstream::masterNo(), pBufs);
+            string buf(recvSizes[Pstream::masterNo()], '\0');
+            is.read(&buf[0], recvSizes[Pstream::masterNo()]);
+
+            if (debug)
+            {
+                Pout<< "masterUncollatedFileOperation::NewIFstream:"
+                    << " Done reading " << buf.size() << " bytes" << endl;
+            }
+
+            // Note: IPstream is not an IStream so use a IStringStream to
+            //       convert the buffer. Note that we construct with a string
+            //       so it holds a copy of the buffer.
+            return autoPtr<ISstream>(new IStringStream(filePath, buf));
+        }
+    }
+    else
+    {
+        // Read myself
+        return autoPtr<ISstream>(new IFstream(filePath));
+    }
+}
+
+
+Foam::autoPtr<Foam::Ostream>
+Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
+(
+    const fileName& pathName,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    return autoPtr<Ostream>
+    (
+        new masterOFstream
+        (
+            pathName,
+            fmt,
+            ver,
+            cmp,
+            false,      // append
+            valid
+        )
+    );
+}
+
+
+Foam::label Foam::fileOperations::masterUncollatedFileOperation::addWatch
+(
+    const fileName& fName
+) const
+{
+    label watchFd;
+    if (Pstream::master())
+    {
+        watchFd = monitor().addWatch(fName);
+    }
+    Pstream::scatter(watchFd);
+    return watchFd;
+}
+
+
+bool Foam::fileOperations::masterUncollatedFileOperation::removeWatch
+(
+    const label watchIndex
+) const
+{
+    bool ok;
+    if (Pstream::master())
+    {
+        ok = monitor().removeWatch(watchIndex);
+    }
+    Pstream::scatter(ok);
+    return ok;
+}
+
+
+Foam::label Foam::fileOperations::masterUncollatedFileOperation::findWatch
+(
+    const labelList& watchIndices,
+    const fileName& fName
+) const
+{
+    label index = -1;
+
+    if (Pstream::master())
+    {
+        forAll(watchIndices, i)
+        {
+            if (monitor().getFile(watchIndices[i]) == fName)
+            {
+                index = i;
+                break;
+            }
+        }
+    }
+    Pstream::scatter(index);
+    return index;
+}
+
+
+void Foam::fileOperations::masterUncollatedFileOperation::addWatches
+(
+    regIOobject& rio,
+    const fileNameList& files
+) const
+{
+    const labelList& watchIndices = rio.watchIndices();
+
+    DynamicList<label> newWatchIndices;
+    labelHashSet removedWatches(watchIndices);
+
+    forAll(files, i)
+    {
+        const fileName& f = files[i];
+        label index = findWatch(watchIndices, f);
+
+        if (index == -1)
+        {
+            newWatchIndices.append(addWatch(f));
+        }
+        else
+        {
+            // Existing watch
+            newWatchIndices.append(watchIndices[index]);
+            removedWatches.erase(index);
+        }
+    }
+
+    // Remove any unused watches
+    forAllConstIter(labelHashSet, removedWatches, iter)
+    {
+        removeWatch(watchIndices[iter.key()]);
+    }
+
+    rio.watchIndices() = newWatchIndices;
+}
+
+
+Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::getFile
+(
+    const label watchIndex
+) const
+{
+    fileName fName;
+    if (Pstream::master())
+    {
+        fName = monitor().getFile(watchIndex);
+    }
+    Pstream::scatter(fName);
+    return fName;
+}
+
+
+void Foam::fileOperations::masterUncollatedFileOperation::updateStates
+(
+    const bool masterOnly,
+    const bool syncPar
+) const
+{
+    if (Pstream::master())
+    {
+        monitor().updateStates(true, false);
+    }
+}
+
+
+Foam::fileMonitor::fileState
+Foam::fileOperations::masterUncollatedFileOperation::getState
+(
+    const label watchFd
+) const
+{
+    unsigned int state = fileMonitor::UNMODIFIED;
+    if (Pstream::master())
+    {
+        state = monitor().getState(watchFd);
+    }
+    Pstream::scatter(state);
+    return fileMonitor::fileState(state);
+}
+
+
+void Foam::fileOperations::masterUncollatedFileOperation::setUnmodified
+(
+    const label watchFd
+) const
+{
+    if (Pstream::master())
+    {
+        monitor().setUnmodified(watchFd);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
new file mode 100644
index 000000000..3d9a6b8b9
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -0,0 +1,715 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileOperations::masterUncollatedFileOperation
+
+Description
+    fileOperations that performs all file operations on the master processor.
+    Requires the calls to be parallel synchronised!
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fileOperations_masterUncollatedFileOperation_H
+#define fileOperations_masterUncollatedFileOperation_H
+
+#include "fileOperation.H"
+#include "OSspecific.H"
+#include "HashPtrTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class PstreamBuffers;
+
+namespace fileOperations
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class masterUncollatedFileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class masterUncollatedFileOperation
+:
+    public fileOperation
+{
+protected:
+
+    // Protected data
+
+        //- Cached times for a given directory
+        mutable HashPtrTable<instantList> times_;
+
+
+    // Protected classes
+
+        class mkDirOp
+        {
+            const mode_t mode_;
+        public:
+            mkDirOp(const mode_t mode)
+            :
+                mode_(mode)
+            {}
+
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::mkDir(fName, mode_);
+            }
+        };
+
+        class chModOp
+        {
+            const mode_t mode_;
+        public:
+            chModOp(const mode_t mode)
+            :
+                mode_(mode)
+            {}
+
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::chMod(fName, mode_);
+            }
+        };
+
+        class modeOp
+        {
+            const bool followLink_;
+        public:
+            modeOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+            mode_t operator()(const fileName& fName) const
+            {
+                return Foam::mode(fName, followLink_);
+            }
+        };
+
+        class typeOp
+        {
+            const bool followLink_;
+        public:
+            typeOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+            label operator()(const fileName& fName) const
+            {
+                return Foam::type(fName, followLink_);
+            }
+        };
+
+        class existsOp
+        {
+            const bool checkGzip_;
+            const bool followLink_;
+        public:
+            existsOp(const bool checkGzip, const bool followLink)
+            :
+                checkGzip_(checkGzip),
+                followLink_(followLink)
+            {}
+
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::exists(fName, checkGzip_, followLink_);
+            }
+        };
+
+        class isDirOp
+        {
+            const bool followLink_;
+        public:
+            isDirOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::isDir(fName, followLink_);
+            }
+        };
+
+        class isFileOp
+        {
+            const bool checkGzip_;
+            const bool followLink_;
+        public:
+            isFileOp(const bool checkGzip, const bool followLink)
+            :
+                checkGzip_(checkGzip),
+                followLink_(followLink)
+            {}
+        public:
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::isFile(fName, checkGzip_, followLink_);
+            }
+        };
+
+        class fileSizeOp
+        {
+            const bool followLink_;
+        public:
+            fileSizeOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            off_t operator()(const fileName& fName) const
+            {
+                return Foam::fileSize(fName, followLink_);
+            }
+        };
+
+        class lastModifiedOp
+        {
+            const bool followLink_;
+        public:
+            lastModifiedOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            time_t operator()(const fileName& fName) const
+            {
+                return Foam::lastModified(fName, followLink_);
+            }
+        };
+
+        class lastModifiedHROp
+        {
+            const bool followLink_;
+        public:
+            lastModifiedHROp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            double operator()(const fileName& fName) const
+            {
+                return Foam::highResLastModified(fName, followLink_);
+            }
+        };
+
+        class mvBakOp
+        {
+            std::string ext_;
+        public:
+            mvBakOp(const std::string& ext)
+            :
+                ext_(ext)
+            {}
+
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::mvBak(fName, ext_);
+            }
+        };
+
+        class rmOp
+        {
+        public:
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::rm(fName);
+            }
+        };
+
+        class rmDirOp
+        {
+        public:
+            bool operator()(const fileName& fName) const
+            {
+                return Foam::rmDir(fName);
+            }
+        };
+
+        class cpOp
+        {
+            const bool followLink_;
+        public:
+            cpOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            bool operator()(const fileName& src, const fileName& dest) const
+            {
+                return Foam::cp(src, dest, followLink_);
+            }
+        };
+
+        class lnOp
+        {
+        public:
+            bool operator()(const fileName& src, const fileName& dest) const
+            {
+                return Foam::ln(src, dest);
+            }
+        };
+
+        class mvOp
+        {
+            const bool followLink_;
+        public:
+            mvOp(const bool followLink)
+            :
+                followLink_(followLink)
+            {}
+
+        public:
+            bool operator()(const fileName& src, const fileName& dest) const
+            {
+                return Foam::mv(src, dest, followLink_);
+            }
+        };
+
+        class fileOrNullOp
+        {
+            const bool isFile_;
+        public:
+            fileOrNullOp(const bool isFile)
+            :
+                isFile_(isFile)
+            {}
+
+            fileName operator()(const fileName& fName) const
+            {
+                return
+                (
+                    (isFile_ && Foam::isFile(fName))
+                 || (!isFile_ && Foam::isDir(fName))
+                  ? fName
+                  : fileName::null
+                );
+            }
+        };
+
+        class readDirOp
+        {
+            const fileName::Type type_;
+            const bool filtergz_;
+            const bool followLink_;
+        public:
+            readDirOp
+            (
+                const fileName::Type type,
+                const bool filtergz,
+                const bool followLink
+            )
+            :
+                type_(type),
+                filtergz_(filtergz),
+                followLink_(followLink)
+            {}
+
+            fileNameList operator()(const fileName& fName) const
+            {
+                return Foam::readDir(fName, type_, filtergz_, followLink_);
+            }
+        };
+
+
+    // Private Member Functions
+
+        template<class Type>
+        Type scatterList(const UList<Type>&) const;
+
+        template<class Type, class fileOp>
+        Type masterOp(const fileName&, const fileOp& fop) const;
+
+        template<class Type, class fileOp>
+        Type masterOp
+        (
+            const fileName&,
+            const fileName&,
+            const fileOp& fop
+        ) const;
+
+        //- Equivalent of Time::findInstance
+        static word findInstancePath
+        (
+            const instantList& timeDirs,
+            const instant& t
+        );
+
+        //- Search for object; return info on how was found
+        //    checkGlobal : also check undecomposed case
+        //    isFile      : true:check for file  false:check for directory
+        fileName filePath
+        (
+            const bool checkGlobal,
+            const bool isFile,
+            const IOobject&,
+            pathType&,
+            word&
+        ) const;
+
+        //- Construct filePath
+        static fileName objectPath
+        (
+            const IOobject&,
+            const pathType&,
+            const word&
+        );
+
+        //- Read file contents and send to processors
+        static void readAndSend
+        (
+            const fileName& filePath,
+            const IOstream::compressionType cmp,
+            const labelUList& procs,
+            PstreamBuffers& pBufs
+        );
+
+
+public:
+
+        //- Runtime type information
+        TypeName("masterUncollated");
+
+
+    // Static data
+
+        //- Max size of parallel communications. Switches from non-blocking
+        //  to scheduled when reading/writing files. Read as float to enable
+        //  easy specificiation of large sizes.
+        static float maxMasterFileBufferSize;
+
+
+    // Constructors
+
+        //- Construct null
+        masterUncollatedFileOperation(const bool verbose);
+
+
+    //- Destructor
+    virtual ~masterUncollatedFileOperation();
+
+
+    // Member Functions
+
+        // OSSpecific equivalents
+
+            //- Make directory
+            virtual bool mkDir(const fileName&, mode_t=0777) const;
+
+            //- Set the file mode
+            virtual bool chMod(const fileName&, const mode_t) const;
+
+            //- Return the file mode
+            virtual mode_t mode
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return the file type: DIRECTORY, FILE or LINK
+            virtual fileName::Type type
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist (as DIRECTORY or FILE) in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool exists
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a DIRECTORY in the file system?
+            virtual bool isDir
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a FILE in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool isFile
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Return size of file
+            virtual off_t fileSize
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual time_t lastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual double highResLastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Read a directory and return the entries as a string list
+            virtual fileNameList readDir
+            (
+                const fileName&,
+                const fileName::Type=fileName::FILE,
+                const bool filtergz=true,
+                const bool followLink = true
+            ) const;
+
+            //- Copy, recursively if necessary, the source to the destination
+            virtual bool cp
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = true
+            ) const;
+
+            //- Create a softlink. dst should not exist. Returns true if
+            //  successful.
+            virtual bool ln(const fileName& src, const fileName& dst) const;
+
+            //- Rename src to dst
+            virtual bool mv
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = false
+            ) const;
+
+            //- Rename to a corresponding backup file
+            //  If the backup file already exists, attempt with
+            //  "01" .. "99" suffix
+            virtual bool mvBak
+            (
+                const fileName&,
+                const std::string& ext = "bak"
+            ) const;
+
+            //- Remove a file, returning true if successful otherwise false
+            virtual bool rm(const fileName&) const;
+
+            //- Remove a dirctory and its contents
+            virtual bool rmDir(const fileName&) const;
+
+//            //- Open a shared library. Return handle to library. Print error
+//            //  message if library cannot be loaded (check = true)
+//            virtual void* dlOpen
+//            (
+//                const fileName& lib,
+//                const bool check = true
+//            ) const;
+
+
+        // (reg)IOobject functinality
+
+            //- Search for an object. checkGlobal : also check undecomposed case
+            virtual fileName filePath
+            (
+                const bool checkGlobal,
+                const IOobject&,
+                const word& typeName
+            ) const;
+
+            //- Search for a directory. checkGlobal : also check undecomposed
+            //  case
+            virtual fileName dirPath
+            (
+                const bool checkGlobal,
+                const IOobject&
+            ) const;
+
+            //- Search directory for objects. Used in IOobjectList.
+            virtual fileNameList readObjects
+            (
+                const objectRegistry& db,
+                const fileName& instance,
+                const fileName& local,
+                word& newInstance
+            ) const;
+
+            //- Read object header from supplied file
+            virtual bool readHeader
+            (
+                IOobject&,
+                const fileName&,
+                const word& typeName
+            ) const;
+
+            //- Reads header for regIOobject and returns an ISstream
+            //  to read the contents.
+            virtual autoPtr<ISstream> readStream
+            (
+                regIOobject&,
+                const fileName&,
+                const word& typeName,
+                const bool valid = true
+            ) const;
+
+            //- Top-level read
+            virtual bool read
+            (
+                regIOobject&,
+                const bool masterOnly,
+                const IOstream::streamFormat format,
+                const word& typeName
+            ) const;
+
+            //- Writes a regIOobject (so header, contents and divider).
+            //  Returns success state.
+            virtual bool writeObject
+            (
+                const regIOobject&,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const;
+
+            //- Generate an ISstream that reads a file
+            virtual autoPtr<ISstream> NewIFstream(const fileName&) const;
+
+            //- Generate an Ostream that writes a file
+            virtual autoPtr<Ostream> NewOFstream
+            (
+                const fileName& pathname,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const;
+
+
+        // File modification checking
+
+            //- Add watching of a file. Returns handle
+            virtual label addWatch(const fileName&) const;
+
+            //- Remove watch on a file (using handle)
+            virtual bool removeWatch(const label) const;
+
+            //- Find index (or -1) of file in list of handles
+            virtual label findWatch
+            (
+                const labelList& watchIndices,
+                const fileName&
+            ) const;
+
+            //- Helper: add watches for list of regIOobjects
+            virtual void addWatches(regIOobject&, const fileNameList&) const;
+
+            //- Get name of file being watched (using handle)
+            virtual fileName getFile(const label) const;
+
+            //- Update state of all files
+            virtual void updateStates
+            (
+                const bool masterOnly,
+                const bool syncPar
+            ) const;
+
+            //- Get current state of file (using handle)
+            virtual fileMonitor::fileState getState(const label) const;
+
+            //- Set current state of file (using handle) to unmodified
+            virtual void setUnmodified(const label) const;
+
+
+        // Other
+
+            //- Same file?
+            static bool uniformFile(const fileNameList&);
+
+            //- Get sorted list of times
+            virtual instantList findTimes(const fileName&, const word&) const;
+
+            //- Callback for time change
+            virtual void setTime(const Time&) const;
+
+            //- root+casename with any 'processorXXX' replaced by 'processsors'
+            static fileName processorsCasePath(const IOobject&);
+
+            //- Like io.path with provided instance and any 'processorXXX'
+            //  replaced by 'processsors'
+            static fileName processorsPath(const IOobject&, const word&);
+
+            //- Operating on fileName: replace processorXXX with processors
+            static fileName processorsPath(const fileName&);
+
+            //- Split fileName into part before processor and part after.
+            //  Returns -1 or processor number. Use with care.
+            //  - path/"processor" + Foam::name(proci)/local reconstructs input
+            //  - path/"processors"/local reconstructs processors equivalence
+            static label splitProcessorPath
+            (
+                const fileName&,
+                fileName& path,
+                fileName& local
+            );
+
+            //- Return cached times
+            const HashPtrTable<instantList>& times() const
+            {
+                return times_;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileOperations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "masterUncollatedFileOperationTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperationTemplates.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperationTemplates.C
new file mode 100644
index 000000000..5c1a5b071
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperationTemplates.C
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Pstream.H"
+#include "IFstream.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::fileOperations::masterUncollatedFileOperation::scatterList
+(
+    const UList<Type>& masterLst
+) const
+{
+    // TBD: more efficient scatter
+    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    if (Pstream::master())
+    {
+        for (label proci = 1; proci < Pstream::nProcs(); proci++)
+        {
+            UOPstream os(proci, pBufs);
+            os << masterLst[proci];
+        }
+    }
+    pBufs.finishedSends();
+
+    Type myResult;
+
+    if (Pstream::master())
+    {
+        myResult = masterLst[Pstream::myProcNo()];
+    }
+    else
+    {
+        UIPstream is(Pstream::masterNo(), pBufs);
+        is >> myResult;
+    }
+    return myResult;
+}
+
+
+template<class Type, class fileOp>
+Type Foam::fileOperations::masterUncollatedFileOperation::masterOp
+(
+    const fileName& fName,
+    const fileOp& fop
+) const
+{
+    if (IFstream::debug)
+    {
+        Pout<< "masterUncollatedFileOperation : Operation on " << fName << endl;
+    }
+    if (Pstream::parRun())
+    {
+        List<fileName> filePaths(Pstream::nProcs());
+        filePaths[Pstream::myProcNo()] = fName;
+        Pstream::gatherList(filePaths);
+
+        List<Type> result(Pstream::nProcs());
+        if (Pstream::master())
+        {
+            result = fop(filePaths[0]);
+            for (label i = 1; i < filePaths.size(); i++)
+            {
+                if (filePaths[i] != filePaths[0])
+                {
+                    result[i] = fop(filePaths[i]);
+                }
+            }
+        }
+
+        return scatterList(result);
+    }
+    else
+    {
+        return fop(fName);
+    }
+}
+
+
+template<class Type, class fileOp>
+Type Foam::fileOperations::masterUncollatedFileOperation::masterOp
+(
+    const fileName& src,
+    const fileName& dest,
+    const fileOp& fop
+) const
+{
+    if (IFstream::debug)
+    {
+        Pout<< "masterUncollatedFileOperation : Operation on src:" << src
+            << " dest:" << dest << endl;
+    }
+    if (Pstream::parRun())
+    {
+        List<fileName> srcs(Pstream::nProcs());
+        srcs[Pstream::myProcNo()] = src;
+        Pstream::gatherList(srcs);
+
+        List<fileName> dests(Pstream::nProcs());
+        dests[Pstream::myProcNo()] = dest;
+        Pstream::gatherList(dests);
+
+        List<Type> result(Pstream::nProcs());
+        if (Pstream::master())
+        {
+            result = fop(srcs[0], dests[0]);
+            for (label i = 1; i < srcs.size(); i++)
+            {
+                if (srcs[i] != srcs[0])
+                {
+                    result[i] = fop(srcs[i], dests[i]);
+                }
+            }
+        }
+
+        return scatterList(result);
+    }
+    else
+    {
+        return fop(src, dest);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
new file mode 100644
index 000000000..2cc81f34f
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -0,0 +1,673 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "uncollatedFileOperation.H"
+#include "Time.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "masterUncollatedFileOperation.H"
+#include "decomposedBlockData.H"
+#include "dummyISstream.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+namespace fileOperations
+{
+    defineTypeNameAndDebug(uncollatedFileOperation, 0);
+    addToRunTimeSelectionTable(fileOperation, uncollatedFileOperation, word);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::fileName Foam::fileOperations::uncollatedFileOperation::doFilePath
+(
+    const bool checkGlobal,
+    const bool isFile,
+    const IOobject& io
+) const
+{
+    if (io.instance().isAbsolute())
+    {
+        fileName objectPath = io.instance()/io.name();
+
+        if (isFileOrDir(isFile, objectPath))
+        {
+            return objectPath;
+        }
+        else
+        {
+            return fileName::null;
+        }
+    }
+    else
+    {
+        fileName path = io.path();
+        fileName objectPath = path/io.name();
+
+        if (isFileOrDir(isFile, objectPath))
+        {
+            return objectPath;
+        }
+        else
+        {
+            if
+            (
+                checkGlobal
+             && io.time().processorCase()
+             && (
+                    io.instance() == io.time().system()
+                 || io.instance() == io.time().constant()
+                )
+            )
+            {
+                // Constant & system can come from global case
+
+                fileName parentObjectPath =
+                    io.rootPath()/io.time().globalCaseName()
+                   /io.instance()/io.db().dbDir()/io.local()/io.name();
+
+                if (isFileOrDir(isFile, parentObjectPath))
+                {
+                    return parentObjectPath;
+                }
+            }
+
+            // Check if parallel "procesors" directory
+            if (io.time().processorCase())
+            {
+                fileName path = fileOperations::masterUncollatedFileOperation::
+                processorsPath
+                (
+                    io,
+                    io.instance()
+                );
+                fileName objectPath = path/io.name();
+
+                if (isFileOrDir(isFile, objectPath))
+                {
+                    return objectPath;
+                }
+            }
+
+
+            // Check for approximately same time. E.g. if time = 1e-2 and
+            // directory is 0.01 (due to different time formats)
+            if (!Foam::isDir(path))
+            {
+                word newInstancePath = io.time().findInstancePath
+                (
+                    instant(io.instance())
+                );
+
+                if (newInstancePath.size())
+                {
+                    fileName fName
+                    (
+                        io.rootPath()/io.caseName()
+                       /newInstancePath/io.db().dbDir()/io.local()/io.name()
+                    );
+
+                    if (isFileOrDir(isFile, fName))
+                    {
+                        return fName;
+                    }
+                }
+            }
+        }
+
+        return fileName::null;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileOperations::uncollatedFileOperation::uncollatedFileOperation
+(
+    const bool verbose
+)
+{
+    if (verbose)
+    {
+        Info<< "I/O    : " << typeName << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperations::uncollatedFileOperation::~uncollatedFileOperation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::fileOperations::uncollatedFileOperation::mkDir
+(
+    const fileName& dir,
+    mode_t mode
+) const
+{
+    return Foam::mkDir(dir, mode);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::chMod
+(
+    const fileName& fName,
+    mode_t mode
+) const
+{
+    return Foam::chMod(fName, mode);
+}
+
+
+mode_t Foam::fileOperations::uncollatedFileOperation::mode
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::mode(fName, followLink);
+}
+
+
+Foam::fileName::Type Foam::fileOperations::uncollatedFileOperation::type
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::type(fName, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::exists
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    return Foam::exists(fName, checkGzip, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::isDir
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::isDir(fName, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::isFile
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    return Foam::isFile(fName, checkGzip, followLink);
+}
+
+
+off_t Foam::fileOperations::uncollatedFileOperation::fileSize
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::fileSize(fName, followLink);
+}
+
+
+time_t Foam::fileOperations::uncollatedFileOperation::lastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::lastModified(fName, followLink);
+}
+
+
+double Foam::fileOperations::uncollatedFileOperation::highResLastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    return Foam::highResLastModified(fName, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::mvBak
+(
+    const fileName& fName,
+    const std::string& ext
+) const
+{
+    return Foam::mvBak(fName, ext);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::rm
+(
+    const fileName& fName
+) const
+{
+    return Foam::rm(fName);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::rmDir
+(
+    const fileName& dir
+) const
+{
+    return Foam::rmDir(dir);
+}
+
+
+Foam::fileNameList Foam::fileOperations::uncollatedFileOperation::readDir
+(
+    const fileName& dir,
+    const fileName::Type type,
+    const bool filtergz,
+    const bool followLink
+) const
+{
+    return Foam::readDir(dir, type, filtergz, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::cp
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    return Foam::cp(src, dst, followLink);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::ln
+(
+    const fileName& src,
+    const fileName& dst
+) const
+{
+    return Foam::ln(src, dst);
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::mv
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    return Foam::mv(src, dst, followLink);
+}
+
+
+Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePath
+(
+    const bool checkGlobal,
+    const IOobject& io,
+    const word& typeName
+) const
+{
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::filePath :"
+            << " objectPath:" << io.objectPath()
+            << " checkGlobal:" << checkGlobal << endl;
+    }
+
+    fileName objPath(doFilePath(checkGlobal, true, io));
+
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::filePath :"
+            << " Returning from file searching:" << endl
+            << "    objectPath:" << io.objectPath() << endl
+            << "    filePath  :" << objPath << endl << endl;
+    }
+    return objPath;
+}
+
+
+Foam::fileName Foam::fileOperations::uncollatedFileOperation::dirPath
+(
+    const bool checkGlobal,
+    const IOobject& io
+) const
+{
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::dirPath :"
+            << " objectPath:" << io.objectPath()
+            << " checkGlobal:" << checkGlobal << endl;
+    }
+
+    fileName objPath(doFilePath(checkGlobal, false, io));
+
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::dirPath :"
+            << " Returning from directory searching:" << endl
+            << "    objectPath:" << io.objectPath() << endl
+            << "    dirPath   :" << objPath << endl << endl;
+    }
+    return objPath;
+}
+
+
+Foam::fileNameList Foam::fileOperations::uncollatedFileOperation::readObjects
+(
+    const objectRegistry& db,
+    const fileName& instance,
+    const fileName& local,
+    word& newInstance
+) const
+{
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::readObjects :"
+            << " db:" << db.objectPath()
+            << " instance:" << instance << endl;
+    }
+
+    //- Use non-time searching version
+    fileNameList objectNames
+    (
+        fileOperation::readObjects(db, instance, local, newInstance)
+    );
+
+    if (newInstance.empty())
+    {
+        // Find similar time
+        fileName newInst = db.time().findInstancePath(instant(instance));
+        if (!newInst.empty() && newInst != instance)
+        {
+            // Try with new time
+            objectNames = fileOperation::readObjects
+            (
+                db,
+                newInst,
+                local,
+                newInstance
+            );
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "uncollatedFileOperation::readObjects :"
+            << " newInstance:" << newInstance
+            << " objectNames:" << objectNames << endl;
+    }
+
+    return objectNames;
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::readHeader
+(
+    IOobject& io,
+    const fileName& fName,
+    const word& typeName
+) const
+{
+    if (fName.empty())
+    {
+        if (IOobject::debug)
+        {
+            InfoInFunction
+                << "file " << io.objectPath() << " could not be opened"
+                << endl;
+        }
+
+        return false;
+    }
+
+    autoPtr<ISstream> isPtr(NewIFstream(fName));
+
+    if (!isPtr.valid() || !isPtr->good())
+    {
+        return false;
+    }
+
+    bool ok = io.readHeader(isPtr());
+
+    if (io.headerClassName() == decomposedBlockData::typeName)
+    {
+        // Read the header inside the container (master data)
+        ok = decomposedBlockData::readMasterHeader(io, isPtr());
+    }
+
+    return ok;
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::uncollatedFileOperation::readStream
+(
+    regIOobject& io,
+    const fileName& fName,
+    const word& typeName,
+    const bool valid
+) const
+{
+    autoPtr<ISstream> isPtr;
+
+    if (!valid)
+    {
+        isPtr = autoPtr<ISstream>(new dummyISstream());
+        return isPtr;
+    }
+
+    if (fName.empty())
+    {
+        FatalErrorInFunction
+            << "cannot find file " << io.objectPath()
+            << exit(FatalError);
+    }
+
+    isPtr = NewIFstream(fName);
+
+    if (!isPtr.valid() || !isPtr->good())
+    {
+        FatalIOError
+        (
+            "uncollatedFileOperation::readStream()",
+            __FILE__,
+            __LINE__,
+            fName,
+            0
+        )   << "cannot open file"
+            << exit(FatalIOError);
+    }
+    else if (!io.readHeader(isPtr()))
+    {
+        FatalIOErrorInFunction(isPtr())
+            << "problem while reading header for object " << io.name()
+            << exit(FatalIOError);
+    }
+
+    if (io.headerClassName() != decomposedBlockData::typeName)
+    {
+        return isPtr;
+    }
+    else
+    {
+        // Analyse the objectpath to find out the processor we're trying
+        // to access
+        fileName path;
+        fileName local;
+        label proci = fileOperations::masterUncollatedFileOperation::
+        splitProcessorPath
+        (
+            io.objectPath(),
+            path,
+            local
+        );
+
+        if (proci == -1)
+        {
+            FatalIOErrorInFunction(isPtr())
+                << "could not detect processor number"
+                << " from objectPath:" << io.objectPath()
+                << exit(FatalIOError);
+        }
+
+        // Read data and return as stream
+        return decomposedBlockData::readBlock(proci, isPtr(), io);
+    }
+}
+
+
+bool Foam::fileOperations::uncollatedFileOperation::read
+(
+    regIOobject& io,
+    const bool masterOnly,
+    const IOstream::streamFormat format,
+    const word& typeName
+) const
+{
+    bool ok = true;
+    if (Pstream::master() || !masterOnly)
+    {
+        if (debug)
+        {
+            Pout<< "uncollatedFileOperation::read() : "
+                << "reading object " << io.objectPath()
+                << " from file " << endl;
+        }
+
+        // Set flag for e.g. codeStream
+        const bool oldGlobal = io.globalObject();
+        io.globalObject() = masterOnly;
+        // If codeStream originates from dictionary which is
+        // not IOdictionary we have a problem so use global
+        const bool oldFlag = regIOobject::masterOnlyReading;
+        regIOobject::masterOnlyReading = masterOnly;
+
+        // Read file
+        ok = io.readData(io.readStream(typeName));
+        io.close();
+
+        // Restore flags
+        io.globalObject() = oldGlobal;
+        regIOobject::masterOnlyReading = oldFlag;
+    }
+
+    if (masterOnly && Pstream::parRun())
+    {
+        // Master reads headerclassname from file. Make sure this gets
+        // transfered as well as contents.
+        Pstream::scatter(io.headerClassName());
+        Pstream::scatter(io.note());
+
+        // Get my communication order
+        const List<Pstream::commsStruct>& comms =
+        (
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+          ? Pstream::linearCommunication()
+          : Pstream::treeCommunication()
+        );
+        const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
+
+        // Reveive from up
+        if (myComm.above() != -1)
+        {
+            IPstream fromAbove
+            (
+                Pstream::commsTypes::scheduled,
+                myComm.above(),
+                0,
+                Pstream::msgType(),
+                Pstream::worldComm,
+                format
+            );
+            ok = io.readData(fromAbove);
+        }
+
+        // Send to my downstairs neighbours
+        forAll(myComm.below(), belowI)
+        {
+            OPstream toBelow
+            (
+                Pstream::commsTypes::scheduled,
+                myComm.below()[belowI],
+                0,
+                Pstream::msgType(),
+                Pstream::worldComm,
+                format
+            );
+            bool okWrite = io.writeData(toBelow);
+            ok = ok && okWrite;
+        }
+    }
+    return ok;
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::uncollatedFileOperation::NewIFstream
+(
+    const fileName& filePath
+) const
+{
+    return autoPtr<ISstream>(new IFstream(filePath));
+}
+
+
+Foam::autoPtr<Foam::Ostream>
+Foam::fileOperations::uncollatedFileOperation::NewOFstream
+(
+    const fileName& pathName,
+    IOstream::streamFormat fmt,
+    IOstream::versionNumber ver,
+    IOstream::compressionType cmp,
+    const bool valid
+) const
+{
+    return autoPtr<Ostream>(new OFstream(pathName, fmt, ver, cmp));
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
new file mode 100644
index 000000000..f63820183
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fileOperations::uncollatedFileOperation
+
+Description
+    fileOperation that assumes file operations are local.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fileOperations_uncollatedFileOperation_H
+#define fileOperations_uncollatedFileOperation_H
+
+#include "fileOperation.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileOperations
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class uncollatedFileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class uncollatedFileOperation
+:
+    public fileOperation
+{
+    // Private Member Functions
+
+        //- Search for an object.
+        //    checkGlobal : also check undecomposed case
+        //    isFile      : true:check for file  false:check for directory
+        fileName doFilePath
+        (
+            const bool checkGlobal,
+            const bool isFile,
+            const IOobject&
+        ) const;
+
+
+public:
+
+        //- Runtime type information
+        TypeName("uncollated");
+
+
+    // Constructors
+
+        //- Construct null
+        uncollatedFileOperation(const bool verbose);
+
+
+    //- Destructor
+    virtual ~uncollatedFileOperation();
+
+
+    // Member Functions
+
+        // OSSpecific equivalents
+
+            //- Make directory
+            virtual bool mkDir(const fileName&, mode_t=0777) const;
+
+            //- Set the file mode
+            virtual bool chMod(const fileName&, const mode_t) const;
+
+            //- Return the file mode
+            virtual mode_t mode
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return the file type: DIRECTORY, FILE or LINK
+            virtual fileName::Type type
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist (as DIRECTORY or FILE) in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool exists
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a DIRECTORY in the file system?
+            virtual bool isDir
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a FILE in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool isFile
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Return size of file
+            virtual off_t fileSize
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual time_t lastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual double highResLastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Read a directory and return the entries as a string list
+            virtual fileNameList readDir
+            (
+                const fileName&,
+                const fileName::Type=fileName::FILE,
+                const bool filtergz=true,
+                const bool followLink = true
+            ) const;
+
+            //- Copy, recursively if necessary, the source to the destination
+            virtual bool cp
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = true
+            ) const;
+
+             //- Create a softlink. dst should not exist. Returns true if
+            //  successful.
+            virtual bool ln(const fileName& src, const fileName& dst) const;
+
+            //- Rename src to dst
+            virtual bool mv
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = false
+            ) const;
+
+            //- Rename to a corresponding backup file
+            //  If the backup file already exists, attempt with
+            //  "01" .. "99" suffix
+            virtual bool mvBak
+            (
+                const fileName&,
+                const std::string& ext = "bak"
+            ) const;
+
+            //- Remove a file, returning true if successful otherwise false
+            virtual bool rm(const fileName&) const;
+
+            //- Remove a dirctory and its contents
+            virtual bool rmDir(const fileName&) const;
+
+//            //- Open a shared library. Return handle to library. Print error
+//            //  message if library cannot be loaded (check = true)
+//            virtual void* dlOpen
+//            (
+//                const fileName& lib,
+//                const bool check = true
+//            ) const;
+
+
+        // (reg)IOobject functinality
+
+            //- Search for an object. checkGlobal : also check undecomposed case
+            virtual fileName filePath
+            (
+                const bool checkGlobal,
+                const IOobject&,
+                const word& typeName
+            ) const;
+
+            //- Search for a directory. checkGlobal : also check undecomposed
+            //  case
+            virtual fileName dirPath
+            (
+                const bool checkGlobal,
+                const IOobject&
+            ) const;
+
+            //- Search directory for objects. Used in IOobjectList.
+            virtual fileNameList readObjects
+            (
+                const objectRegistry& db,
+                const fileName& instance,
+                const fileName& local,
+                word& newInstance
+            ) const;
+
+            //- Read object header from supplied file
+            virtual bool readHeader
+            (
+                IOobject&,
+                const fileName&,
+                const word& typeName
+            ) const;
+
+            //- Reads header for regIOobject and returns an ISstream
+            //  to read the contents.
+            virtual autoPtr<ISstream> readStream
+            (
+                regIOobject&,
+                const fileName&,
+                const word& typeName,
+                const bool procValid = true
+            ) const;
+
+            //- Top-level read
+            virtual bool read
+            (
+                regIOobject&,
+                const bool masterOnly,
+                const IOstream::streamFormat format,
+                const word& typeName
+            ) const;
+
+            //- Generate an ISstream that reads a file
+            virtual autoPtr<ISstream> NewIFstream(const fileName&) const;
+
+            //- Generate an Ostream that writes a file
+            virtual autoPtr<Ostream> NewOFstream
+            (
+                const fileName& pathname,
+                IOstream::streamFormat format=IOstream::ASCII,
+                IOstream::versionNumber version=IOstream::currentVersion,
+                IOstream::compressionType compression=IOstream::UNCOMPRESSED,
+                const bool valid = true
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileOperations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 66a4ecc44..319a8541e 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,47 +100,63 @@ bool mkDir(const fileName&, mode_t=0777);
 bool chMod(const fileName&, const mode_t);
 
 //- Return the file mode
-mode_t mode(const fileName&);
+mode_t mode(const fileName&, const bool followLink = true);
 
 //- Return the file type: DIRECTORY or FILE
-fileName::Type type(const fileName&);
+fileName::Type type(const fileName&, const bool followLink = true);
 
 //- Does the name exist (as DIRECTORY or FILE) in the file system?
 //  Optionally enable/disable check for gzip file.
-bool exists(const fileName&, const bool checkGzip=true);
+bool exists
+(
+    const fileName&,
+    const bool checkGzip=true,
+    const bool followLink = true
+);
 
 //- Does the name exist as a DIRECTORY in the file system?
-bool isDir(const fileName&);
+bool isDir(const fileName&, const bool followLink = true);
 
 //- Does the name exist as a FILE in the file system?
 //  Optionally enable/disable check for gzip file.
-bool isFile(const fileName&, const bool checkGzip=true);
+bool isFile
+(
+    const fileName&,
+    const bool checkGzip=true,
+    const bool followLink = true
+);
 
 //- Return size of file
-off_t fileSize(const fileName&);
+off_t fileSize(const fileName&, const bool followLink = true);
 
 //- Return time of last file modification
-time_t lastModified(const fileName&);
+time_t lastModified(const fileName&, const bool followLink = true);
 
 //- Return time of last file modification
-double highResLastModified(const fileName&);
+double highResLastModified(const fileName&, const bool followLink = true);
 
 //- Read a directory and return the entries as a string list
 fileNameList readDir
 (
     const fileName&,
     const fileName::Type=fileName::FILE,
-    const bool filtergz=true
+    const bool filtergz=true,
+    const bool followLink = true
 );
 
 //- Copy, recursively if necessary, the source to the destination
-bool cp(const fileName& src, const fileName& dst);
+bool cp(const fileName& src, const fileName& dst, const bool followLink = true);
 
 //- Create a softlink. dst should not exist. Returns true if successful.
 bool ln(const fileName& src, const fileName& dst);
 
 //- Rename src to dst
-bool mv(const fileName& src, const fileName& dst);
+bool mv
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink = false
+);
 
 //- Rename to a corresponding backup file
 //  If the backup file already exists, attempt with "01" .. "99" suffix
@@ -196,6 +212,33 @@ label osRandomInteger();
 scalar osRandomDouble();
 
 
+// Thread handling
+
+//- Allocate a thread
+label allocateThread();
+
+//- Start a thread
+void createThread(const label, void *(*start_routine) (void *), void *arg);
+
+//- Wait for thread
+void joinThread(const label);
+
+//- Delete a thread
+void freeThread(const label);
+
+//- Allocate a mutex variable
+label allocateMutex();
+
+//- Lock a mutex variable
+void lockMutex(const label);
+
+//- Unlock a mutex variable
+void unlockMutex(const label);
+
+//- Free a mutex variable
+void freeMutex(const label);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index a656d5f7f..41965cf27 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "IFstream.H"
+//#include "IFstream.H"
 #include "openFoamTableReader.H"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 6d71af140..b0dfd76fe 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "interpolationTable.H"
-#include "IFstream.H"
 #include "openFoamTableReader.H"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 130f5b9c9..ae2c0cb5e 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "csvTableReader.H"
-#include "IFstream.H"
+#include "fileOperation.H"
 #include "DynamicList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -108,7 +108,9 @@ void Foam::csvTableReader<Type>::operator()
     List<Tuple2<scalar, Type>>& data
 )
 {
-    IFstream in(fName);
+    //IFstream in(fName);
+    autoPtr<ISstream> inPtr(fileHandler().NewIFstream(fName));
+    ISstream& in = inPtr();
 
     DynamicList<Tuple2<scalar, Type>> values;
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
index dc5451a50..1a7f42628 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "openFoamTableReader.H"
-#include "IFstream.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ void Foam::openFoamTableReader<Type>::operator()
 )
 {
     // Read data from file
-    IFstream(fName)() >> data;
+    fileHandler().NewIFstream(fName)()() >> data;
 }
 
 
@@ -64,7 +64,7 @@ void Foam::openFoamTableReader<Type>::operator()
 )
 {
     // Read data from file
-    IFstream(fName)() >> data;
+    fileHandler().NewIFstream(fName)()() >> data;
 }
 
 
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index 3ceb1a19e..73b538be5 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "uniformInterpolationTable.H"
 #include "Time.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * *  Private Member Functions * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 98e09cd18..60db3a7c1 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1866,7 +1866,7 @@ const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
             IOobject::MUST_READ
         );
 
-        if (addrHeader.headerOk())
+        if (addrHeader.typeHeaderOk<labelIOList>(true))
         {
             // There is a pointProcAddressing file so use it to get labels
             // on the original mesh
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 4c59e4f9c..f8d4c8550 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -1151,10 +1151,11 @@ bool Foam::polyBoundaryMesh::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
-    return regIOobject::writeObject(fmt, ver, IOstream::UNCOMPRESSED);
+    return regIOobject::writeObject(fmt, ver, IOstream::UNCOMPRESSED, valid);
 }
 
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 114fc2316..a5317e928 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index ab5ff0311..23943df92 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -147,7 +147,7 @@ Foam::autoPtr<Foam::labelIOList> Foam::polyMesh::readTetBasePtIs() const
         IOobject::NO_WRITE
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<labelIOList>())
     {
         return autoPtr<labelIOList>(new labelIOList(io));
     }
@@ -292,7 +292,7 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     curMotionTimeIndex_(time().timeIndex()),
     oldPointsPtr_(nullptr)
 {
-    if (exists(owner_.objectPath()))
+    if (!owner_.headerClassName().empty())
     {
         initMesh();
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index bdadc2f86..3e3b47ada 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -237,7 +237,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         // Boundary is set so can use initMesh now (uses boundary_ to
         // determine internal and active faces)
 
-        if (exists(owner_.objectPath()))
+        if (!owner_.headerClassName().empty())
         {
             initMesh();
         }
diff --git a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
index daa989021..4d5c14be5 100644
--- a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
+++ b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.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-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "preservePatchTypes.H"
 #include "polyBoundaryMeshEntries.H"
+#include "polyBoundaryMesh.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -56,7 +57,7 @@ void Foam::preservePatchTypes
             false
         );
 
-        if (patchEntriesHeader.headerOk())
+        if (patchEntriesHeader.typeHeaderOk<polyBoundaryMesh>(true))
         {
             // Create a list of entries from the boundary file.
             polyBoundaryMeshEntries patchEntries(patchEntriesHeader);
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index d494090b3..aa6aafe3f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -25,7 +25,7 @@ License
 
 #include "CSV.H"
 #include "DynamicList.H"
-#include "IFstream.H"
+//#include "IFstream.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -92,7 +92,9 @@ template<class Type>
 void Foam::Function1Types::CSV<Type>::read()
 {
     fileName expandedFile(fName_);
-    IFstream is(expandedFile.expand());
+    //IFstream is(expandedFile.expand());
+    autoPtr<ISstream> isPtr(fileHandler().NewIFstream(expandedFile.expand()));
+    ISstream& is = isPtr();
 
     if (!is.good())
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index aa86056cb..f4e1740f4 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -40,7 +40,9 @@ Foam::Function1Types::TableFile<Type>::TableFile
     dict.lookup("file") >> fName_;
 
     fileName expandedFile(fName_);
-    IFstream is(expandedFile.expand());
+    //IFstream is(expandedFile.expand());
+    autoPtr<ISstream> isPtr(fileHandler().NewIFstream(expandedFile.expand()));
+    ISstream& is = isPtr();
 
     if (!is.good())
     {
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index dfbe2d0de..49a188cbc 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "wordList.H"
 #include "DynamicList.H"
 #include "OSspecific.H"
+#include "fileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -48,9 +49,9 @@ Foam::fileName::fileName(const wordList& lst)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::fileName::Type Foam::fileName::type() const
+Foam::fileName::Type Foam::fileName::type(const bool followLink) const
 {
-    return ::Foam::type(*this);
+    return ::Foam::type(*this, followLink);
 }
 
 
@@ -401,7 +402,7 @@ Foam::fileName Foam::operator/(const string& a, const string& b)
 Foam::fileName Foam::search(const word& file, const fileName& directory)
 {
     // Search the current directory for the file
-    fileNameList files(readDir(directory));
+    fileNameList files(fileHandler().readDir(directory));
     forAll(files, i)
     {
         if (files[i] == file)
@@ -411,7 +412,7 @@ Foam::fileName Foam::search(const word& file, const fileName& directory)
     }
 
     // If not found search each of the sub-directories
-    fileNameList dirs(readDir(directory, fileName::DIRECTORY));
+    fileNameList dirs(fileHandler().readDir(directory, fileName::DIRECTORY));
     forAll(dirs, i)
     {
         fileName path = search(file, directory/dirs[i]);
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index 7b0c160bd..8fa555afd 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,8 +154,9 @@ public:
 
         // Interrogation
 
-            //- Return the file type: FILE, DIRECTORY or UNDEFINED
-            Type type() const;
+            //- Return the file type: FILE, DIRECTORY, UNDEFINED or
+            //  LINK (only if followLink=false)
+            Type type(const bool followLink = true) const;
 
             //- Return true if file name is absolute
             bool isAbsolute() const;
diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H
index 67d6b2b68..47b78e24e 100644
--- a/src/OpenFOAM/primitives/strings/string/string.H
+++ b/src/OpenFOAM/primitives/strings/string/string.H
@@ -115,6 +115,9 @@ public:
         //- Construct from a single character
         inline string(const char);
 
+        //- Construct from copies of a single character
+        inline string(const size_type, const char);
+
         //- Construct from Istream
         string(Istream&);
 
diff --git a/src/OpenFOAM/primitives/strings/string/stringI.H b/src/OpenFOAM/primitives/strings/string/stringI.H
index 3dc2fe043..df723c2fa 100644
--- a/src/OpenFOAM/primitives/strings/string/stringI.H
+++ b/src/OpenFOAM/primitives/strings/string/stringI.H
@@ -58,6 +58,12 @@ inline Foam::string::string(const char c)
 {}
 
 
+inline Foam::string::string(const size_type len, const char c)
+:
+    std::string(len, c)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class String>
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 4e105aa76..317eaf260 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -61,7 +61,15 @@ void Foam::UPstream::addValidParOptions(HashTable<string>& validParOptions)
 
 bool Foam::UPstream::init(int& argc, char**& argv)
 {
-    MPI_Init(&argc, &argv);
+    //MPI_Init(&argc, &argv);
+    int provided_thread_support;
+    MPI_Init_thread
+    (
+        &argc,
+        &argv,
+        MPI_THREAD_MULTIPLE,
+        &provided_thread_support
+    );
 
     int numprocs;
     MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
@@ -86,6 +94,15 @@ bool Foam::UPstream::init(int& argc, char**& argv)
     // Initialise parallel structure
     setParRun(numprocs);
 
+    if (Pstream::master() && provided_thread_support != MPI_THREAD_MULTIPLE)
+    {
+        WarningInFunction
+            << "mpi does not seem to have thread support."
+            << " There might be issues with e.g. threaded IO"
+            << endl;
+    }
+
+
     #ifndef SGIMPI
     string bufferSizeName = getEnv("MPI_BUFFER_SIZE");
 
diff --git a/src/conversion/meshReader/meshReader.C b/src/conversion/meshReader/meshReader.C
index 611b655d6..9be9678d3 100644
--- a/src/conversion/meshReader/meshReader.C
+++ b/src/conversion/meshReader/meshReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,8 @@ void Foam::meshReader::writeMesh
     (
         fmt,
         IOstream::currentVersion,
-        IOstream::UNCOMPRESSED
+        IOstream::UNCOMPRESSED,
+        true
     );
     writeAux(mesh);
 }
diff --git a/src/conversion/meshReader/meshReaderAux.C b/src/conversion/meshReader/meshReaderAux.C
index eb7c86248..1cec60e69 100644
--- a/src/conversion/meshReader/meshReaderAux.C
+++ b/src/conversion/meshReader/meshReaderAux.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,8 @@ void Foam::meshReader::writeMeshLabelList
     (
         fmt,
         IOstream::currentVersion,
-        IOstream::UNCOMPRESSED
+        IOstream::UNCOMPRESSED,
+        true
     );
 }
 
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index e8045134c..d1f9a2815 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -1399,7 +1399,8 @@ bool Foam::dynamicRefineFvMesh::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     // Force refinement data to go to the current time directory.
@@ -1407,8 +1408,8 @@ bool Foam::dynamicRefineFvMesh::writeObject
 
     bool writeOk =
     (
-        dynamicFvMesh::writeObject(fmt, ver, cmp)
-     && meshCutter_.write()
+        dynamicFvMesh::writeObject(fmt, ver, cmp, valid)
+     && meshCutter_.write(valid)
     );
 
     if (dumpLevel_)
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index 1700732d5..86a61e2b7 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -241,7 +241,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
 };
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
index c16ebe3a9..6aef7e602 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,17 +111,19 @@ Foam::componentDisplacementMotionSolver::componentDisplacementMotionSolver
             << "Number of points in mesh " << mesh.nPoints()
             << " differs from number of points " << points0_.size()
             << " read from file "
-            <<
-                IOobject
+            <<  typeFilePath<pointIOField>
                 (
-                    "points",
-                    mesh.time().constant(),
-                    polyMesh::meshSubDir,
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ).filePath()
+                    IOobject
+                    (
+                        "points",
+                        mesh.time().constant(),
+                        polyMesh::meshSubDir,
+                        mesh,
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    )
+                )
             << exit(FatalError);
     }
 }
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 29966de36..b385fd438 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::IOobject Foam::points0MotionSolver::points0IO
             false
         );
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<pointIOField>())
         {
             return io;
         }
@@ -122,16 +122,19 @@ Foam::points0MotionSolver::points0MotionSolver
             << "Number of points in mesh " << mesh.nPoints()
             << " differs from number of points " << points0_.size()
             << " read from file "
-            <<  IOobject
+            <<  typeFilePath<pointIOField>
                 (
-                    "points",
-                    time().constant(),
-                    polyMesh::meshSubDir,
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ).filePath()
+                    IOobject
+                    (
+                        "points",
+                        time().constant(),
+                        polyMesh::meshSubDir,
+                        mesh,
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    )
+                )
             << exit(FatalError);
     }
 }
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 37dd6f11a..4a916ee89 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -221,7 +221,8 @@ bool Foam::motionSolver::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     return true;
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index 54cf7987d..b4436307a 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index fc0416f96..edee6642c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -5747,16 +5747,16 @@ void Foam::hexRef8::setUnrefinement
 
 
 // Write refinement to polyMesh directory.
-bool Foam::hexRef8::write() const
+bool Foam::hexRef8::write(const bool valid) const
 {
     bool writeOk =
-        cellLevel_.write()
-     && pointLevel_.write()
-     && level0Edge_.write();
+        cellLevel_.write(valid)
+     && pointLevel_.write(valid)
+     && level0Edge_.write(valid);
 
     if (history_.active())
     {
-        writeOk = writeOk && history_.write();
+        writeOk = writeOk && history_.write(valid);
     }
 
     return writeOk;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 09694f7a4..2af58ae53 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -566,7 +566,7 @@ public:
             void setInstance(const fileName& inst);
 
             //- Force writing refinement+history to polyMesh directory.
-            bool write() const;
+            bool write(const bool valid = true) const;
 
 };
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index 5d8605e1c..f8821a1e5 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,11 @@ Foam::hexRef8Data::hexRef8Data(const IOobject& io)
     {
         IOobject rio(io);
         rio.rename("cellLevel");
-        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        bool haveFile = returnReduce
+        (
+            rio.typeHeaderOk<labelIOList>(true),
+            orOp<bool>()
+        );
         if (haveFile)
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
@@ -51,7 +55,11 @@ Foam::hexRef8Data::hexRef8Data(const IOobject& io)
     {
         IOobject rio(io);
         rio.rename("pointLevel");
-        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        bool haveFile = returnReduce
+        (
+            rio.typeHeaderOk<labelIOList>(true),
+            orOp<bool>()
+        );
         if (haveFile)
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
@@ -61,7 +69,11 @@ Foam::hexRef8Data::hexRef8Data(const IOobject& io)
     {
         IOobject rio(io);
         rio.rename("level0Edge");
-        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        bool haveFile = returnReduce
+        (
+            rio.typeHeaderOk<uniformDimensionedScalarField>(true),
+            orOp<bool>()
+        );
         if (haveFile)
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
@@ -71,7 +83,11 @@ Foam::hexRef8Data::hexRef8Data(const IOobject& io)
     {
         IOobject rio(io);
         rio.rename("refinementHistory");
-        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        bool haveFile = returnReduce
+        (
+            rio.typeHeaderOk<refinementHistory>(true),
+            orOp<bool>()
+        );
         if (haveFile)
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
diff --git a/src/engine/engineTime/engineTime.H b/src/engine/engineTime/engineTime.H
index 84d33c0a4..2ccb142a1 100644
--- a/src/engine/engineTime/engineTime.H
+++ b/src/engine/engineTime/engineTime.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ SourceFiles
 #define engineTime_H
 
 #include "Time.H"
-#include "dictionary.H"
+#include "IOdictionary.H"
 #include "dimensionedScalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.C
index 84921de80..8080dba88 100644
--- a/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::IOobject Foam::IOMRFZoneList::createIOobject
         IOobject::NO_WRITE
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<IOdictionary>(true))
     {
         Info<< "Creating MRF zone list from " << io.name() << endl;
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
index b9fe6d149..267a5510b 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ Foam::IOobject Foam::fv::options::createIOobject
         IOobject::NO_WRITE
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<IOdictionary>(true))
     {
         Info<< "Creating finite volume options from "
             << io.instance()/io.name() << nl
@@ -68,7 +68,7 @@ Foam::IOobject Foam::fv::options::createIOobject
         // Check if the fvOptions file is in system
         io.instance() = mesh.time().system();
 
-        if (io.headerOk())
+        if (io.typeHeaderOk<IOdictionary>(true))
         {
             Info<< "Creating finite volume options from "
                 << io.instance()/io.name() << nl
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
index c92961fba..bdf30cfe3 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
@@ -43,7 +43,7 @@ Foam::IOobject Foam::IOporosityModelList::createIOobject
         IOobject::NO_WRITE
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<IOdictionary>(true))
     {
         Info<< "Creating porosity model list from " << io.name() << nl << endl;
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 0c64a01fb..a018b5ddd 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -125,7 +125,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
                 name,
                 startTimeName,
                 mesh()
-            ).headerOk()
+            ).typeHeaderOk<DDt0Field<GeoField>>()
         )
         {
             regIOobject::store
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index a0261cf79..ac48815e9 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -269,7 +269,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 
     // Check the existence of the cell volumes and read if present
     // and set the storage of V00
-    if (isFile(time().timePath()/"V0"))
+    if (fileHandler().isFile(time().timePath()/"V0"))
     {
         V0Ptr_ = new DimensionedField<scalar, volMesh>
         (
@@ -290,7 +290,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 
     // Check the existence of the mesh fluxes, read if present and set the
     // mesh to be moving
-    if (isFile(time().timePath()/"meshPhi"))
+    if (fileHandler().isFile(time().timePath()/"meshPhi"))
     {
         phiPtr_ = new surfaceScalarField
         (
@@ -860,22 +860,23 @@ bool Foam::fvMesh::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     bool ok = true;
     if (phiPtr_)
     {
-        ok = phiPtr_->write();
+        ok = phiPtr_->write(valid);
     }
 
-    return ok && polyMesh::writeObject(fmt, ver, cmp);
+    return ok && polyMesh::writeObject(fmt, ver, cmp, valid);
 }
 
 
-bool Foam::fvMesh::write() const
+bool Foam::fvMesh::write(const bool valid) const
 {
-    return polyMesh::write();
+    return polyMesh::write(valid);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 3625af35f..ba19d3173 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -363,11 +363,12 @@ public:
             (
                 IOstream::streamFormat fmt,
                 IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::compressionType cmp,
+                const bool valid
             ) const;
 
             //- Write mesh using IO settings from time
-            virtual bool write() const;
+            virtual bool write(const bool valid = true) const;
 
 
     // Member Operators
diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C
index d337b0db5..efdda6a94 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverage.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverage.C
@@ -240,7 +240,7 @@ void Foam::functionObjects::fieldAverage::readAveragingProperties()
             false
         );
 
-        if (!propsDictHeader.headerOk())
+        if (!propsDictHeader.typeHeaderOk<IOdictionary>())
         {
             Log << "    Starting averaging at time "
                 << obr_.time().timeName() << nl;
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
index c03c49cae..19980a635 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::transform
 
         if
         (
-            fieldHeader.headerOk()
+            fieldHeader.typeHeaderOk<VolFieldType>(false)
          && fieldHeader.headerClassName() == VolFieldType::typeName
         )
         {
@@ -105,7 +105,7 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::transform
         }
         else if
         (
-            fieldHeader.headerOk()
+            fieldHeader.typeHeaderOk<SurfaceFieldType>(false)
          && fieldHeader.headerClassName() == SurfaceFieldType::typeName
         )
         {
diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C
index 238b995ee..4dbddedc8 100644
--- a/src/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/functionObjects/field/readFields/readFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ void Foam::functionObjects::readFields::loadField
 
         if
         (
-            fieldHeader.headerOk()
+            fieldHeader.typeHeaderOk<VolFieldType>(false)
          && fieldHeader.headerClassName() == VolFieldType::typeName
         )
         {
@@ -79,7 +79,7 @@ void Foam::functionObjects::readFields::loadField
         }
         else if
         (
-            fieldHeader.headerOk()
+            fieldHeader.typeHeaderOk<SurfaceFieldType>(false)
          && fieldHeader.headerClassName() == SurfaceFieldType::typeName
         )
         {
diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C
index 1ed8a2ff8..2d2512b4d 100644
--- a/src/functionObjects/field/streamLine/streamLine.C
+++ b/src/functionObjects/field/streamLine/streamLine.C
@@ -533,7 +533,7 @@ bool Foam::functionObjects::streamLine::write()
             vtkPath = vtkPath/mesh_.name();
         }
         vtkPath = vtkPath/mesh_.time().timeName();
-
+        vtkPath.clean();
         mkDir(vtkPath);
 
         // Convert track positions
diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C
index 3f224ff0c..b3d7e9004 100644
--- a/src/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/functionObjects/field/streamLine/streamLineParticle.C
@@ -362,22 +362,25 @@ void Foam::streamLineParticle::hitPatch
 
 void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+//    if (!c.size())
+//    {
+//        return;
+//    }
+    bool valid = c.size();
 
     particle::readFields(c);
 
     IOField<label> lifeTime
     (
-        c.fieldIOobject("lifeTime", IOobject::MUST_READ)
+        c.fieldIOobject("lifeTime", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldIOobject(c, lifeTime);
 
     vectorFieldIOField sampledPositions
     (
-        c.fieldIOobject("sampledPositions", IOobject::MUST_READ)
+        c.fieldIOobject("sampledPositions", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldIOobject(c, sampledPositions);
 
@@ -395,7 +398,7 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
 {
     particle::writeFields(c);
 
-    label np =  c.size();
+    label np = c.size();
 
     IOField<label> lifeTime
     (
@@ -416,8 +419,8 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
         i++;
     }
 
-    lifeTime.write();
-    sampledPositions.write();
+    lifeTime.write(np > 0);
+    sampledPositions.write(np > 0);
 }
 
 
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index 58032fc7d..482fb158e 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "Time.H"
 #include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -65,7 +66,7 @@ bool Foam::functionObjects::writeDictionary::tryDirectory
         false
     );
 
-    if (dictIO.headerOk())
+    if (dictIO.typeHeaderOk<IOdictionary>(true))
     {
         IOdictionary dict(dictIO);
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index c128cea20..a960f4abb 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
     }
 
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<pointVectorField>(true))
     {
         pointLocation_.reset
         (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index 66fb41a76..cdbdb9374 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -82,7 +82,7 @@ uniformInterpolatedDisplacementPointPatchVectorField
             IOobject::NO_WRITE,
             false
         );
-        if (io.headerOk())
+        if (io.typeHeaderOk<pointVectorField>(false))
         {
             names.append(allTimes[i].name());
             values.append(allTimes[i].value());
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index c47e7bff3..83acbf8a9 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,20 +78,21 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
 template<class ParcelType>
 void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType>>& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, U);
 
-    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::MUST_READ));
+    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, Ei);
 
-    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::MUST_READ));
+    IOField<label> typeId
+    (
+        c.fieldIOobject("typeId", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, typeId);
 
     label i = 0;
@@ -115,7 +116,7 @@ void Foam::DSMCParcel<ParcelType>::writeFields
 {
     ParcelType::writeFields(c);
 
-    label np =  c.size();
+    label np = c.size();
 
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
     IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::NO_READ), np);
@@ -132,9 +133,9 @@ void Foam::DSMCParcel<ParcelType>::writeFields
         i++;
     }
 
-    U.write();
-    Ei.write();
-    typeId.write();
+    U.write(np > 0);
+    Ei.write(np > 0);
+    typeId.write(np > 0);
 }
 
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 27be0c3a6..aa35eb3b4 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -300,7 +300,8 @@ public:
             (
                 IOstream::streamFormat fmt,
                 IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::compressionType cmp,
+                const bool valid
             ) const;
 
             //- Write positions to \<cloudName\>_positions.obj file
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index e4abc89e6..a4a201b07 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -26,6 +26,7 @@ License
 #include "Cloud.H"
 #include "Time.H"
 #include "IOPosition.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -49,7 +50,7 @@ void Foam::Cloud<ParticleType>::readCloudUniformProperties()
         false
     );
 
-    if (dictObj.headerOk())
+    if (dictObj.typeHeaderOk<IOdictionary>(true))
     {
         const IOdictionary uniformPropsDict(dictObj);
 
@@ -101,7 +102,8 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
     (
         IOstream::ASCII,
         IOstream::currentVersion,
-        time().writeCompression()
+        time().writeCompression(),
+        true
     );
 }
 
@@ -113,19 +115,19 @@ void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
 
     IOPosition<Cloud<ParticleType>> ioP(*this);
 
-    if (ioP.headerOk())
+    bool valid = ioP.headerOk();
+    Istream& is = ioP.readStream(checkClass ? typeName : "", valid);
+    if (valid)
     {
-        ioP.readData(*this, checkClass);
+        ioP.readData(is, *this);
         ioP.close();
     }
-    else
+
+    if (!valid && debug)
     {
-        if (debug)
-        {
-            Pout<< "Cannot read particle positions file:" << nl
-                << "    " << ioP.objectPath() << nl
-                << "Assuming the initial cloud contains 0 particles." << endl;
-        }
+        Pout<< "Cannot read particle positions file:" << nl
+            << "    " << ioP.objectPath() << nl
+            << "Assuming the initial cloud contains 0 particles." << endl;
     }
 
     // Ask for the tetBasePtIs to trigger all processors to build
@@ -219,10 +221,7 @@ void Foam::Cloud<ParticleType>::checkFieldFieldIOobject
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::writeFields() const
 {
-    if (this->size())
-    {
-        ParticleType::writeFields(*this);
-    }
+    ParticleType::writeFields(*this);
 }
 
 
@@ -231,20 +230,14 @@ bool Foam::Cloud<ParticleType>::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool
 ) const
 {
     writeCloudUniformProperties();
 
-    if (this->size())
-    {
-        writeFields();
-        return cloud::writeObject(fmt, ver, cmp);
-    }
-    else
-    {
-        return true;
-    }
+    writeFields();
+    return cloud::writeObject(fmt, ver, cmp, this->size());
 }
 
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index b89b2c0b4..76a4f8a0a 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,16 +48,9 @@ Foam::IOPosition<CloudType>::IOPosition(const CloudType& c)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::IOPosition<CloudType>::write() const
+bool Foam::IOPosition<CloudType>::write(const bool valid) const
 {
-    if (cloud_.size())
-    {
-        return regIOobject::write();
-    }
-    else
-    {
-        return true;
-    }
+    return regIOobject::write(cloud_.size());
 }
 
 
@@ -79,12 +72,10 @@ bool Foam::IOPosition<CloudType>::writeData(Ostream& os) const
 
 
 template<class CloudType>
-void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
+void Foam::IOPosition<CloudType>::readData(Istream& is, CloudType& c)
 {
     const polyMesh& mesh = c.pMesh();
 
-    Istream& is = readStream(checkClass ? typeName : "");
-
     token firstToken(is);
 
     if (firstToken.isLabel())
@@ -92,7 +83,10 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        is.readBeginList("IOPosition<CloudType>::readData(CloudType, bool)");
+        is.readBeginList
+        (
+            "IOPosition<CloudType>::readData(Istream&, CloudType&)"
+        );
 
         for (label i=0; i<s; i++)
         {
@@ -101,7 +95,7 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
         }
 
         // Read end of contents
-        is.readEndList("IOPosition<CloudType>::readData(CloudType, bool)");
+        is.readEndList("IOPosition<CloudType>::readData(Istream&, CloudType&)");
     }
     else if (firstToken.isPunctuation())
     {
@@ -125,7 +119,7 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
         {
             is.putBack(lastToken);
 
-            // Write position only
+            // Read position only
             c.append(new typename CloudType::particleType(mesh, is, false));
             is  >> lastToken;
         }
@@ -142,7 +136,7 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
     // Check state of IOstream
     is.check
     (
-        "void IOPosition<CloudType>::readData(CloudType&, bool)"
+        "void IOPosition<CloudType>::readData(Istream&, CloudType&)"
     );
 }
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 002e4e2ac..fff078e18 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,9 +80,9 @@ public:
         //- Inherit readData from regIOobject
         using regIOobject::readData;
 
-        virtual void readData(CloudType& c, bool checkClass);
+        virtual void readData(Istream&, CloudType&);
 
-        virtual bool write() const;
+        virtual bool write(const bool valid = true) const;
 
         virtual bool writeData(Ostream& os) const;
 };
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index bcb4ea587..37057cbc7 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -103,29 +103,29 @@ void Foam::particle::correctAfterParallelTransfer
 template<class CloudType>
 void Foam::particle::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
 
-    if (procIO.headerOk())
+    bool haveFile = procIO.typeHeaderOk<IOField<label>>(true);
+
+    IOField<label> origProcId(procIO, valid && haveFile);
+    c.checkFieldIOobject(c, origProcId);
+    IOField<label> origId
+    (
+        c.fieldIOobject("origId", IOobject::MUST_READ),
+        valid && haveFile
+    );
+    c.checkFieldIOobject(c, origId);
+
+    label i = 0;
+    forAllIter(typename CloudType, c, iter)
     {
-        IOField<label> origProcId(procIO);
-        c.checkFieldIOobject(c, origProcId);
-        IOField<label> origId(c.fieldIOobject("origId", IOobject::MUST_READ));
-        c.checkFieldIOobject(c, origId);
+        particle& p = iter();
 
-        label i = 0;
-        forAllIter(typename CloudType, c, iter)
-        {
-            particle& p = iter();
-
-            p.origProc_ = origProcId[i];
-            p.origId_ = origId[i];
-            i++;
-        }
+        p.origProc_ = origProcId[i];
+        p.origId_ = origId[i];
+        i++;
     }
 }
 
@@ -133,10 +133,11 @@ void Foam::particle::readFields(CloudType& c)
 template<class CloudType>
 void Foam::particle::writeFields(const CloudType& c)
 {
-    IOPosition<CloudType> ioP(c);
-    ioP.write();
-
     label np = c.size();
+
+    IOPosition<CloudType> ioP(c);
+    ioP.write(np > 0);
+
     IOField<label> origProc
     (
         c.fieldIOobject("origProcId", IOobject::NO_READ),
@@ -156,8 +157,8 @@ void Foam::particle::writeFields(const CloudType& c)
         i++;
     }
 
-    origProc.write();
-    origId.write();
+    origProc.write(np > 0);
+    origId.write(np > 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index fa9c573c3..8b0291bc0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -239,7 +239,8 @@ void Foam::KinematicCloud<CloudType>::postEvolve()
         (
             IOstream::ASCII,
             IOstream::currentVersion,
-            this->db().time().writeCompression()
+            this->db().time().writeCompression(),
+            true
         );
     }
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 4568a9438..3c9264eed 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -351,7 +351,7 @@ void Foam::ReactingCloud<CloudType>::info()
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::writeFields() const
 {
-    if (this->size())
+    if (compositionModel_.valid())
     {
         CloudType::particleType::writeFields(*this, this->composition());
     }
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 3d9d76d60..032c382e4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -278,7 +278,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::info()
 template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::writeFields() const
 {
-    if (this->size())
+    if (this->compositionModel_.valid())
     {
         CloudType::particleType::writeFields(*this, this->composition());
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index f0c2007e4..380111962 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,28 +86,31 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
+    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, f);
 
     IOField<vector> angularMomentum
     (
-        c.fieldIOobject("angularMomentum", IOobject::MUST_READ)
+        c.fieldIOobject("angularMomentum", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldIOobject(c, angularMomentum);
 
-    IOField<vector> torque(c.fieldIOobject("torque", IOobject::MUST_READ));
+    IOField<vector> torque
+    (
+        c.fieldIOobject("torque", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, torque);
 
     labelFieldCompactIOField collisionRecordsPairAccessed
     (
-        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ)
+        c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairAccessed);
 
@@ -117,7 +120,8 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
         (
             "collisionRecordsPairOrigProcOfOther",
             IOobject::MUST_READ
-        )
+        ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
 
@@ -127,31 +131,36 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
         (
             "collisionRecordsPairOrigIdOfOther",
             IOobject::MUST_READ
-        )
+        ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
 
     pairDataFieldCompactIOField collisionRecordsPairData
     (
-        c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ)
+        c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairData);
 
     labelFieldCompactIOField collisionRecordsWallAccessed
     (
-        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ)
+        c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallAccessed);
 
     vectorFieldCompactIOField collisionRecordsWallPRel
     (
-        c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ)
+        c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallPRel);
 
     wallDataFieldCompactIOField collisionRecordsWallData
     (
-        c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ)
+        c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallData);
 
@@ -187,7 +196,7 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
 {
     ParcelType::writeFields(c);
 
-    label np =  c.size();
+    label np = c.size();
 
     IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
     IOField<vector> angularMomentum
@@ -260,17 +269,19 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
         i++;
     }
 
-    f.write();
-    angularMomentum.write();
-    torque.write();
+    const bool valid = (np > 0);
 
-    collisionRecordsPairAccessed.write();
-    collisionRecordsPairOrigProcOfOther.write();
-    collisionRecordsPairOrigIdOfOther.write();
-    collisionRecordsPairData.write();
-    collisionRecordsWallAccessed.write();
-    collisionRecordsWallPRel.write();
-    collisionRecordsWallData.write();
+    f.write(valid);
+    angularMomentum.write(valid);
+    torque.write(valid);
+
+    collisionRecordsPairAccessed.write(valid);
+    collisionRecordsPairOrigProcOfOther.write(valid);
+    collisionRecordsPairOrigIdOfOther.write(valid);
+    collisionRecordsPairData.write(valid);
+    collisionRecordsWallAccessed.write(valid);
+    collisionRecordsWallPRel.write(valid);
+    collisionRecordsWallData.write(valid);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 901558284..1c6b791ec 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,42 +101,78 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::KinematicParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<label> active(c.fieldIOobject("active", IOobject::MUST_READ));
+    IOField<label> active
+    (
+        c.fieldIOobject("active", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, active);
 
-    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::MUST_READ));
+    IOField<label> typeId
+    (
+        c.fieldIOobject("typeId", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, typeId);
 
-    IOField<scalar>
-        nParticle(c.fieldIOobject("nParticle", IOobject::MUST_READ));
+    IOField<scalar> nParticle
+    (
+        c.fieldIOobject("nParticle", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, nParticle);
 
-    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
+    IOField<scalar> d
+    (
+        c.fieldIOobject("d", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, d);
 
-    IOField<scalar> dTarget(c.fieldIOobject("dTarget", IOobject::MUST_READ));
+    IOField<scalar> dTarget
+    (
+        c.fieldIOobject("dTarget", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, dTarget);
 
-    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
+    IOField<vector> U
+    (
+        c.fieldIOobject("U", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, U);
 
-    IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
+    IOField<scalar> rho
+    (
+        c.fieldIOobject("rho", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, rho);
 
-    IOField<scalar> age(c.fieldIOobject("age", IOobject::MUST_READ));
+    IOField<scalar> age
+    (
+        c.fieldIOobject("age", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, age);
 
-    IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::MUST_READ));
+    IOField<scalar> tTurb
+    (
+        c.fieldIOobject("tTurb", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, tTurb);
 
-    IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
+    IOField<vector> UTurb
+    (
+        c.fieldIOobject("UTurb", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, UTurb);
 
     label i = 0;
@@ -167,7 +203,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
 {
     ParcelType::writeFields(c);
 
-    label np =  c.size();
+    label np = c.size();
 
     IOField<label> active(c.fieldIOobject("active", IOobject::NO_READ), np);
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
@@ -204,16 +240,18 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
         i++;
     }
 
-    active.write();
-    typeId.write();
-    nParticle.write();
-    d.write();
-    dTarget.write();
-    U.write();
-    rho.write();
-    age.write();
-    tTurb.write();
-    UTurb.write();
+    const bool valid = np > 0;
+
+    active.write(valid);
+    typeId.write(valid);
+    nParticle.write(valid);
+    d.write(valid);
+    dTarget.write(valid);
+    U.write(valid);
+    rho.write(valid);
+    age.write(valid);
+    tTurb.write(valid);
+    UTurb.write(valid);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
index ab4eb3e0c..614c5d5c8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,14 +77,15 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::MPPICParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<vector> UCorrect(c.fieldIOobject("UCorrect", IOobject::MUST_READ));
+    IOField<vector> UCorrect
+    (
+        c.fieldIOobject("UCorrect", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, UCorrect);
 
     label i = 0;
@@ -106,7 +107,7 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
 {
     ParcelType::writeFields(c);
 
-    label np =  c.size();
+    label np = c.size();
 
     IOField<vector>
         UCorrect(c.fieldIOobject("UCorrect", IOobject::NO_READ), np);
@@ -122,7 +123,7 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
         i++;
     }
 
-    UCorrect.write();
+    UCorrect.write(np > 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index e219f5ee9..40f465958 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,11 +91,6 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::ReactingMultiphaseParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
-
     ParcelType::readFields(c);
 }
 
@@ -108,10 +103,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c, compModel);
 
@@ -142,7 +134,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
             (
                 "Y" + gasNames[j] + stateLabels[idGas],
                 IOobject::MUST_READ
-            )
+            ),
+            valid
         );
 
         label i = 0;
@@ -166,7 +159,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
             (
                 "Y" + liquidNames[j] + stateLabels[idLiquid],
                  IOobject::MUST_READ
-            )
+            ),
+            valid
         );
 
         label i = 0;
@@ -190,7 +184,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
             (
                 "Y" + solidNames[j] + stateLabels[idSolid],
                 IOobject::MUST_READ
-            )
+            ),
+            valid
         );
 
         label i = 0;
@@ -229,7 +224,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
     label np = c.size();
 
     // Write the composition fractions
-    if (np > 0)
     {
         const wordList& stateLabels = compModel.stateLabels();
 
@@ -259,7 +253,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 YGas[i++] = p0.YGas()[j]*p0.Y()[GAS];
             }
 
-            YGas.write();
+            YGas.write(np > 0);
         }
 
         const label idLiquid = compModel.idLiquid();
@@ -288,7 +282,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQ];
             }
 
-            YLiquid.write();
+            YLiquid.write(np > 0);
         }
 
         const label idSolid = compModel.idSolid();
@@ -317,7 +311,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 YSolid[i++] = p0.YSolid()[j]*p0.Y()[SLD];
             }
 
-            YSolid.write();
+            YSolid.write(np > 0);
         }
     }
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index f0254656c..5d7554ed8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,11 +88,6 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::ReactingParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
-
     ParcelType::readFields(c);
 }
 
@@ -105,14 +100,15 @@ void Foam::ReactingParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::MUST_READ));
+    IOField<scalar> mass0
+    (
+        c.fieldIOobject("mass0", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, mass0);
 
     label i = 0;
@@ -148,7 +144,8 @@ void Foam::ReactingParcel<ParcelType>::readFields
             (
                 "Y" + phaseTypes[j] + stateLabels[j],
                  IOobject::MUST_READ
-            )
+            ),
+            valid
         );
 
         label i = 0;
@@ -181,7 +178,6 @@ void Foam::ReactingParcel<ParcelType>::writeFields
 
     const label np = c.size();
 
-    if (np > 0)
     {
         IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
 
@@ -191,7 +187,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
             const ReactingParcel<ParcelType>& p = iter();
             mass0[i++] = p.mass0_;
         }
-        mass0.write();
+        mass0.write(np > 0);
 
         // Write the composition fractions
         const wordList& phaseTypes = compModel.phaseTypes();
@@ -224,7 +220,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
                 Y[i++] = p.Y()[j];
             }
 
-            Y.write();
+            Y.write(np > 0);
         }
     }
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 93e60505b..2f6c5a1e1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,17 +81,14 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::ThermoParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ));
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, T);
 
-    IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::MUST_READ));
+    IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, Cp);
 
 
@@ -128,8 +125,8 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
         i++;
     }
 
-    T.write();
-    Cp.write();
+    T.write(np > 0);
+    Cp.write(np > 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index 20d230625..072a5bae2 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -70,6 +70,7 @@ Foam::CloudFunctionObject<CloudType>::CloudFunctionObject
     {
         outputDir_ = outputDir_/relPath;
     }
+    outputDir_.clean();
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 8190da2fa..c4b25216e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -49,6 +49,7 @@ SourceFiles
 #include "InjectionModel.H"
 #include "distributionModel.H"
 #include "volFieldsFwd.H"
+#include "GlobalIOField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -84,7 +85,7 @@ class FieldActivatedInjection
             const word positionsFile_;
 
             //- Field of injector (x,y,z) positions
-            vectorIOField positions_;
+            GlobalIOField<vector> positions_;
 
             //- List of cell labels corresponding to injector positions
             labelList injectorCells_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 193d01e47..bd6e07aa4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -47,6 +47,7 @@ SourceFiles
 #include "InjectionModel.H"
 #include "distributionModel.H"
 #include "Switch.H"
+#include "GlobalIOField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +69,7 @@ class ManualInjection
         const word positionsFile_;
 
         //- Field of parcel positions
-        vectorIOField positions_;
+        GlobalIOField<vector> positions_;
 
         //- Field of parcel diameters
         scalarList diameters_;
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 20c054e91..bae331289 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -142,7 +142,7 @@ bool Foam::AveragingMethod<Type>::writeData(Ostream& os) const
 
 
 template<class Type>
-bool Foam::AveragingMethod<Type>::write() const
+bool Foam::AveragingMethod<Type>::write(const bool valid) const
 {
     const pointMesh pointMesh_(mesh_);
 
@@ -238,10 +238,10 @@ bool Foam::AveragingMethod<Type>::write() const
     pointGrad.primitiveFieldRef() /= pointVolume;
 
     // write
-    if (!cellValue.write()) return false;
-    if (!cellGrad.write()) return false;
-    if (!pointValue.write()) return false;
-    if (!pointGrad.write()) return false;
+    if (!cellValue.write(valid)) return false;
+    if (!cellGrad.write(valid)) return false;
+    if (!pointValue.write(valid)) return false;
+    if (!pointGrad.write(valid)) return false;
 
     return true;
 }
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
index cdaea9863..429d2b344 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
@@ -162,7 +162,7 @@ public:
         virtual bool writeData(Ostream&) const;
 
         //- Write using setting from DB
-        virtual bool write() const;
+        virtual bool write(const bool valid = true) const;
 
         //- Return an internal field of the average
         virtual tmp<Field<Type>> primitiveField() const = 0;
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index d6fd3cbd2..91527d0a7 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,38 +93,40 @@ Foam::molecule::molecule
 
 void Foam::molecule::readFields(Cloud<molecule>& mC)
 {
-    if (!mC.size())
-    {
-        return;
-    }
+    bool valid = mC.size();
 
     particle::readFields(mC);
 
-    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ));
+    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, Q);
 
-    IOField<vector> v(mC.fieldIOobject("v", IOobject::MUST_READ));
+    IOField<vector> v(mC.fieldIOobject("v", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, v);
 
-    IOField<vector> a(mC.fieldIOobject("a", IOobject::MUST_READ));
+    IOField<vector> a(mC.fieldIOobject("a", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, a);
 
-    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::MUST_READ));
+    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, pi);
 
-    IOField<vector> tau(mC.fieldIOobject("tau", IOobject::MUST_READ));
+    IOField<vector> tau(mC.fieldIOobject("tau", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, tau);
 
     IOField<vector> specialPosition
     (
-        mC.fieldIOobject("specialPosition", IOobject::MUST_READ)
+        mC.fieldIOobject("specialPosition", IOobject::MUST_READ),
+        valid
     );
     mC.checkFieldIOobject(mC, specialPosition);
 
-    IOField<label> special(mC.fieldIOobject("special", IOobject::MUST_READ));
+    IOField<label> special
+    (
+        mC.fieldIOobject("special", IOobject::MUST_READ),
+        valid
+    );
     mC.checkFieldIOobject(mC, special);
 
-    IOField<label> id(mC.fieldIOobject("id", IOobject::MUST_READ));
+    IOField<label> id(mC.fieldIOobject("id", IOobject::MUST_READ), valid);
     mC.checkFieldIOobject(mC, id);
 
     label i = 0;
@@ -220,21 +222,23 @@ void Foam::molecule::writeFields(const Cloud<molecule>& mC)
         i++;
     }
 
-    Q.write();
-    v.write();
-    a.write();
-    pi.write();
-    tau.write();
-    specialPosition.write();
-    special.write();
-    id.write();
+    const bool valid = np > 0;
 
-    piGlobal.write();
-    tauGlobal.write();
+    Q.write(valid);
+    v.write(valid);
+    a.write(valid);
+    pi.write(valid);
+    tau.write(valid);
+    specialPosition.write(valid);
+    special.write(valid);
+    id.write(valid);
 
-    orientation1.write();
-    orientation2.write();
-    orientation3.write();
+    piGlobal.write(valid);
+    tauGlobal.write(valid);
+
+    orientation1.write(valid);
+    orientation2.write(valid);
+    orientation3.write(valid);
 
     Info<< "writeFields " << mC.name() << endl;
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
index 6a7da5a59..a5aa68522 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,19 +116,26 @@ void Foam::pairPotentialList::readPairPotentialDict
 
             if ((*this)[pairPotentialIndex(a, b)].writeTables())
             {
-                OFstream ppTabFile(mesh.time().path()/pairPotentialName);
+                fileHandler().mkDir(mesh.time().path());
+                autoPtr<Ostream> ppTabFile
+                (
+                    fileHandler().NewOFstream
+                    (
+                        mesh.time().path()/pairPotentialName
+                    )
+                );
 
                 if
                 (
                     !(*this)[pairPotentialIndex(a, b)].writeEnergyAndForceTables
                     (
-                        ppTabFile
+                        ppTabFile()
                     )
                 )
                 {
                     FatalErrorInFunction
                         << "Failed writing to "
-                        << ppTabFile.name() << nl
+                        << ppTabFile().name() << nl
                         << abort(FatalError);
                 }
             }
@@ -155,13 +162,20 @@ void Foam::pairPotentialList::readPairPotentialDict
 
     if (electrostaticPotential_->writeTables())
     {
-        OFstream ppTabFile(mesh.time().path()/"electrostatic");
+        fileHandler().mkDir(mesh.time().path());
+        autoPtr<Ostream> ppTabFile
+        (
+            fileHandler().NewOFstream
+            (
+                mesh.time().path()/"electrostatic"
+            )
+        );
 
-        if (!electrostaticPotential_->writeEnergyAndForceTables(ppTabFile))
+        if (!electrostaticPotential_->writeEnergyAndForceTables(ppTabFile()))
         {
             FatalErrorInFunction
                 << "Failed writing to "
-                << ppTabFile.name() << nl
+                << ppTabFile().name() << nl
                 << abort(FatalError);
         }
     }
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index fe50df977..d5a5fe7b2 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,17 +65,14 @@ Foam::solidParticle::solidParticle
 
 void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     particle::readFields(c);
 
-    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, d);
 
-    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, U);
 
     label i = 0;
@@ -109,8 +106,8 @@ void Foam::solidParticle::writeFields(const Cloud<solidParticle>& c)
         i++;
     }
 
-    d.write();
-    U.write();
+    d.write(np > 0);
+    U.write(np > 0);
 }
 
 
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index dab14e424..d9904cb1c 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,11 +101,6 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::SprayParcel<ParcelType>::readFields(CloudType& c)
 {
-    if (!c.size())
-    {
-        return;
-    }
-
     ParcelType::readFields(c);
 }
 
@@ -118,56 +113,87 @@ void Foam::SprayParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    if (!c.size())
-    {
-        return;
-    }
+    bool valid = c.size();
 
     ParcelType::readFields(c, compModel);
 
-    IOField<scalar> d0(c.fieldIOobject("d0", IOobject::MUST_READ));
+    IOField<scalar> d0(c.fieldIOobject("d0", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, d0);
 
     IOField<vector> position0
     (
-        c.fieldIOobject("position0", IOobject::MUST_READ)
+        c.fieldIOobject("position0", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldIOobject(c, position0);
 
-    IOField<scalar> sigma(c.fieldIOobject("sigma", IOobject::MUST_READ));
+    IOField<scalar> sigma(c.fieldIOobject("sigma", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, sigma);
 
-    IOField<scalar> mu(c.fieldIOobject("mu", IOobject::MUST_READ));
+    IOField<scalar> mu(c.fieldIOobject("mu", IOobject::MUST_READ), valid);
     c.checkFieldIOobject(c, mu);
 
-    IOField<scalar> liquidCore(c.fieldIOobject
+    IOField<scalar> liquidCore
     (
-        "liquidCore", IOobject::MUST_READ)
+        c.fieldIOobject("liquidCore", IOobject::MUST_READ),
+        valid
     );
     c.checkFieldIOobject(c, liquidCore);
 
-    IOField<scalar> KHindex(c.fieldIOobject("KHindex", IOobject::MUST_READ));
+    IOField<scalar> KHindex
+    (
+        c.fieldIOobject("KHindex", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, KHindex);
 
-    IOField<scalar> y(c.fieldIOobject("y", IOobject::MUST_READ));
+    IOField<scalar> y
+    (
+        c.fieldIOobject("y", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, y);
 
-    IOField<scalar> yDot(c.fieldIOobject("yDot", IOobject::MUST_READ));
+    IOField<scalar> yDot
+    (
+        c.fieldIOobject("yDot", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, yDot);
 
-    IOField<scalar> tc(c.fieldIOobject("tc", IOobject::MUST_READ));
+    IOField<scalar> tc
+    (
+        c.fieldIOobject("tc", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, tc);
 
-    IOField<scalar> ms(c.fieldIOobject("ms", IOobject::MUST_READ));
+    IOField<scalar> ms
+    (
+        c.fieldIOobject("ms", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, ms);
 
-    IOField<scalar> injector(c.fieldIOobject("injector", IOobject::MUST_READ));
+    IOField<scalar> injector
+    (
+        c.fieldIOobject("injector", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, injector);
 
-    IOField<scalar> tMom(c.fieldIOobject("tMom", IOobject::MUST_READ));
+    IOField<scalar> tMom
+    (
+        c.fieldIOobject("tMom", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, tMom);
 
-    IOField<scalar> user(c.fieldIOobject("user", IOobject::MUST_READ));
+    IOField<scalar> user
+    (
+        c.fieldIOobject("user", IOobject::MUST_READ),
+        valid
+    );
     c.checkFieldIOobject(c, user);
 
     label i = 0;
@@ -258,19 +284,21 @@ void Foam::SprayParcel<ParcelType>::writeFields
         i++;
     }
 
-    d0.write();
-    position0.write();
-    sigma.write();
-    mu.write();
-    liquidCore.write();
-    KHindex.write();
-    y.write();
-    yDot.write();
-    tc.write();
-    ms.write();
-    injector.write();
-    tMom.write();
-    user.write();
+    const bool valid = np > 0;
+
+    d0.write(valid);
+    position0.write(valid);
+    sigma.write(valid);
+    mu.write(valid);
+    liquidCore.write(valid);
+    KHindex.write(valid);
+    y.write(valid);
+    yDot.write(valid);
+    tc.write(valid);
+    ms.write(valid);
+    injector.write(valid);
+    tMom.write(valid);
+    user.write(valid);
 }
 
 
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 6d0295b83..89f279bb7 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "Time.H"
 #include "Tuple2.H"
 #include "DynamicField.H"
+#include "featureEdgeMesh.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -56,7 +57,7 @@ void Foam::refinementFeatures::read
             false
         );
 
-        const fileName fName(extFeatObj.filePath());
+        const fileName fName(typeFilePath<extendedFeatureEdgeMesh>(extFeatObj));
 
         if (!fName.empty() && extendedEdgeMesh::canRead(fName))
         {
@@ -87,7 +88,7 @@ void Foam::refinementFeatures::read
                 false
             );
 
-            const fileName fName(featObj.filePath());
+            const fileName fName(typeFilePath<featureEdgeMesh>(featObj));
 
             if (fName.empty())
             {
diff --git a/src/meshTools/edgeMesh/edgeMesh.C b/src/meshTools/edgeMesh/edgeMesh.C
index 4188e738e..64f9e1b31 100644
--- a/src/meshTools/edgeMesh/edgeMesh.C
+++ b/src/meshTools/edgeMesh/edgeMesh.C
@@ -286,7 +286,12 @@ void Foam::edgeMesh::scalePoints(const scalar scaleFactor)
 }
 
 
-void Foam::edgeMesh::mergePoints(const scalar mergeDist)
+void Foam::edgeMesh::mergePoints
+(
+    const scalar mergeDist,
+    labelList& reversePointMap
+    //labelList& edgeMap
+)
 {
     pointField newPoints;
     labelList pointMap;
@@ -307,6 +312,9 @@ void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 
         points_.transfer(newPoints);
 
+        // connectivity changed
+        pointEdgesPtr_.clear();
+
         // Renumber and make sure e[0] < e[1] (not really necessary)
         forAll(edges_, edgeI)
         {
@@ -383,6 +391,9 @@ void Foam::edgeMesh::mergeEdges()
     {
         edges_[iter()] = iter.key();
     }
+
+    // connectivity changed
+    pointEdgesPtr_.clear();
 }
 
 
diff --git a/src/meshTools/edgeMesh/edgeMesh.H b/src/meshTools/edgeMesh/edgeMesh.H
index 343a27b0f..7d78ff4f2 100644
--- a/src/meshTools/edgeMesh/edgeMesh.H
+++ b/src/meshTools/edgeMesh/edgeMesh.H
@@ -248,11 +248,12 @@ public:
         //- Scale points. A non-positive factor is ignored
         virtual void scalePoints(const scalar);
 
-        //- Merge common points (points within mergeDist)
-        void mergePoints(const scalar mergeDist);
+        //- Merge common points (points within mergeDist). Return map from
+        //  old to new points.
+        virtual void mergePoints(const scalar mergeDist, labelList&);
 
-        //- Merge similar edges
-        void mergeEdges();
+        //- Merge duplicate edges
+        virtual void mergeEdges();
 
 
     // Write
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
index 19b4732f2..59771b4d7 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
@@ -75,15 +75,16 @@ bool Foam::fileFormats::edgeMeshFormat::read
         false
     );
 
-    if (!io.headerOk())
+    if (!io.typeHeaderOk<featureEdgeMesh>(false))
     {
         FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
 
+    const fileName fName(typeFilePath<featureEdgeMesh>(io));
 
-    autoPtr<IFstream> isPtr(new IFstream(io.filePath()));
+    autoPtr<IFstream> isPtr(new IFstream(fName));
     bool ok = false;
     if (isPtr().good())
     {
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 120d2c5e6..5577c0f6a 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -176,7 +176,7 @@ Foam::extendedEdgeMesh::classifyFeaturePoint
     label ptI
 ) const
 {
-    labelList ptEds(pointEdges()[ptI]);
+    const labelList& ptEds(pointEdges()[ptI]);
 
     label nPtEds = ptEds.size();
     label nExternal = 0;
@@ -287,10 +287,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh()
 {}
 
 
-Foam::extendedEdgeMesh::extendedEdgeMesh
-(
-    const extendedEdgeMesh& fem
-)
+Foam::extendedEdgeMesh::extendedEdgeMesh(const extendedEdgeMesh& fem)
 :
     edgeMesh(fem),
     concaveStart_(fem.concaveStart()),
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 6c324b87a..f5bc7c219 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -265,9 +265,8 @@ public:
             const Xfer<edgeList>&
         );
 
-        //- Construct given a surface with selected edges,point
-        //  (surfaceFeatures), an objectRegistry and a
-        //  fileName to write to.
+        //- Construct given a surface with selected edges,points
+        //  (surfaceFeatures)
         //  Extracts, classifies and reorders the data from surfaceFeatures.
         extendedEdgeMesh
         (
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
index b737724a9..ca3ffa852 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
@@ -24,9 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "extendedEdgeMeshFormat.H"
-#include "edgeMeshFormat.H"
 #include "IFstream.H"
 #include "Time.H"
+#include "extendedFeatureEdgeMesh.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -73,14 +73,16 @@ bool Foam::fileFormats::extendedEdgeMeshFormat::read
         false
     );
 
-    if (!io.headerOk())
+    if (!io.typeHeaderOk<extendedFeatureEdgeMesh>(false))
     {
         FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
 
-    autoPtr<IFstream> isPtr(new IFstream(io.filePath()));
+    const fileName fName(typeFilePath<extendedFeatureEdgeMesh>(io));
+
+    autoPtr<IFstream> isPtr(new IFstream(fName));
     bool ok = false;
     if (isPtr().good())
     {
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index a88df6b44..08a688bfa 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -47,13 +47,8 @@ Foam::extendedFeatureEdgeMesh::extendedFeatureEdgeMesh(const IOobject& io)
      || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
-        if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
-        {
-            WarningInFunction
-                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
-                << " does not support automatic rereading."
-                << endl;
-        }
+        // Warn for MUST_READ_IF_MODIFIED
+        warnNoRereading<extendedFeatureEdgeMesh>();
 
         readStream(typeName) >> *this;
         close();
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
index 602cf4326..f82e851ad 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
@@ -135,9 +135,29 @@ public:
         //- WriteData function required for regIOobject write operation
         virtual bool writeData(Ostream&) const;
 
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
 };
 
 
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<extendedFeatureEdgeMesh>()
+{
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
index 02ebc126a..af5950c2f 100644
--- a/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
+++ b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
@@ -85,9 +85,30 @@ public:
 
         //- WriteData function required for regIOobject write operation
         virtual bool writeData(Ostream&) const;
+
+        //- Is object global
+        virtual bool global() const
+        {
+            return true;
+        }
+
+        //- Return complete path + object name if the file exists
+        //  either in the case/processor or case otherwise null
+        virtual fileName filePath() const
+        {
+            return globalFilePath(type());
+        }
 };
 
 
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<featureEdgeMesh>()
+{
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index a5dcb18c8..6a9f99553 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -41,9 +41,18 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::fileName Foam::triSurfaceMesh::checkFile(const IOobject& io)
+Foam::fileName Foam::triSurfaceMesh::checkFile
+(
+    const regIOobject& io,
+    const bool isGlobal
+)
 {
-    const fileName fName(io.filePath());
+    const fileName fName
+    (
+        isGlobal
+      ? io.globalFilePath(typeName)
+      : io.localFilePath(typeName)
+    );
     if (fName.empty())
     {
         FatalErrorInFunction
@@ -57,8 +66,9 @@ Foam::fileName Foam::triSurfaceMesh::checkFile(const IOobject& io)
 
 Foam::fileName Foam::triSurfaceMesh::checkFile
 (
-    const IOobject& io,
-    const dictionary& dict
+    const regIOobject& io,
+    const dictionary& dict,
+    const bool isGlobal
 )
 {
     fileName fName;
@@ -78,7 +88,13 @@ Foam::fileName Foam::triSurfaceMesh::checkFile
     }
     else
     {
-        fName = io.filePath();
+        fName =
+        (
+            isGlobal
+          ? io.globalFilePath(typeName)
+          : io.localFilePath(typeName)
+        );
+
         if (!exists(fName))
         {
             FatalErrorInFunction
@@ -238,7 +254,7 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io)
             false       // searchableSurface already registered under name
         )
     ),
-    triSurface(checkFile(static_cast<const searchableSurface&>(*this))),
+    triSurface(checkFile(static_cast<const searchableSurface&>(*this), true)),
     triSurfaceRegionSearch(static_cast<const triSurface&>(*this)),
     minQuality_(-1),
     surfaceClosed_(-1)
@@ -270,7 +286,10 @@ Foam::triSurfaceMesh::triSurfaceMesh
             false       // searchableSurface already registered under name
         )
     ),
-    triSurface(checkFile(static_cast<const searchableSurface&>(*this), dict)),
+    triSurface
+    (
+        checkFile(static_cast<const searchableSurface&>(*this), dict, true)
+    ),
     triSurfaceRegionSearch(static_cast<const triSurface&>(*this), dict),
     minQuality_(-1),
     surfaceClosed_(-1)
@@ -303,6 +322,95 @@ Foam::triSurfaceMesh::triSurfaceMesh
 }
 
 
+Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io, const bool isGlobal)
+:
+    // Find instance for triSurfaceMesh
+    searchableSurface(io),
+    // Reused found instance in objectRegistry
+    objectRegistry
+    (
+        IOobject
+        (
+            io.name(),
+            searchableSurface::instance(),
+            io.local(),
+            io.db(),
+            io.readOpt(),
+            io.writeOpt(),
+            false       // searchableSurface already registered under name
+        )
+    ),
+    triSurface
+    (
+        checkFile(static_cast<const searchableSurface&>(*this), isGlobal)
+    ),
+    triSurfaceRegionSearch(static_cast<const triSurface&>(*this)),
+    minQuality_(-1),
+    surfaceClosed_(-1)
+{
+    const pointField& pts = triSurface::points();
+
+    bounds() = boundBox(pts);
+}
+
+
+Foam::triSurfaceMesh::triSurfaceMesh
+(
+    const IOobject& io,
+    const dictionary& dict,
+    const bool isGlobal
+)
+:
+    searchableSurface(io),
+    // Reused found instance in objectRegistry
+    objectRegistry
+    (
+        IOobject
+        (
+            io.name(),
+            searchableSurface::instance(),
+            io.local(),
+            io.db(),
+            io.readOpt(),
+            io.writeOpt(),
+            false       // searchableSurface already registered under name
+        )
+    ),
+    triSurface
+    (
+        checkFile(static_cast<const searchableSurface&>(*this), dict, isGlobal)
+    ),
+    triSurfaceRegionSearch(static_cast<const triSurface&>(*this), dict),
+    minQuality_(-1),
+    surfaceClosed_(-1)
+{
+    // Reading from supplied file name instead of objectPath/filePath
+    dict.readIfPresent("file", fName_, false, false);
+
+    scalar scaleFactor = 0;
+
+    // Allow rescaling of the surface points
+    // eg, CAD geometries are often done in millimeters
+    if (dict.readIfPresent("scale", scaleFactor) && scaleFactor > 0)
+    {
+        Info<< searchableSurface::name() << " : using scale " << scaleFactor
+            << endl;
+        triSurface::scalePoints(scaleFactor);
+    }
+
+    const pointField& pts = triSurface::points();
+
+    bounds() = boundBox(pts);
+
+    // Have optional minimum quality for normal calculation
+    if (dict.readIfPresent("minQuality", minQuality_) && minQuality_ > 0)
+    {
+        Info<< searchableSurface::name()
+            << " : ignoring triangles with quality < "
+            << minQuality_ << " for normals calculation." << endl;
+    }
+}
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::triSurfaceMesh::~triSurfaceMesh()
@@ -734,7 +842,8 @@ bool Foam::triSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     fileName fullPath;
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
index 9f3ea6d0a..74dba39e9 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
@@ -90,10 +90,15 @@ class triSurfaceMesh
     // Private Member Functions
 
         //- Return fileName to load IOobject from
-        static fileName checkFile(const IOobject& io);
+        static fileName checkFile(const regIOobject& io, const bool isGlobal);
 
         //- Return fileName to load IOobject from. Optional override of fileName
-        static fileName checkFile(const IOobject&, const dictionary&);
+        static fileName checkFile
+        (
+            const regIOobject&,
+            const dictionary&,
+            const bool isGlobal
+        );
 
         //- Helper function for isSurfaceClosed
         static bool addFaceToEdge
@@ -135,7 +140,7 @@ public:
         //- Construct from triSurface
         triSurfaceMesh(const IOobject&, const triSurface&);
 
-        //- Construct read.
+        //- Construct read
         triSurfaceMesh(const IOobject& io);
 
         //- Construct from IO and dictionary (used by searchableSurface).
@@ -147,6 +152,19 @@ public:
         );
 
 
+        // Special constructors for use by distributedTriSurface. File search
+        // status (local/global) supplied.
+
+            triSurfaceMesh(const IOobject& io, const bool isGlobal);
+
+            triSurfaceMesh
+            (
+                const IOobject& io,
+                const dictionary& dict,
+                const bool isGlobal
+            );
+
+
     //- Destructor
     virtual ~triSurfaceMesh();
 
@@ -277,11 +295,33 @@ public:
             (
                 IOstream::streamFormat fmt,
                 IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::compressionType cmp,
+                const bool valid
             ) const;
+
+            //- Is object global
+            virtual bool global() const
+            {
+                return true;
+            }
+
+            //- Return complete path + object name if the file exists
+            //  either in the case/processor or case otherwise null
+            virtual fileName filePath() const
+            {
+                return searchableSurface::globalFilePath(type());
+            }
 };
 
 
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<triSurfaceMesh>()
+{
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index a17bf2769..c9791ccd1 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,7 +190,9 @@ void Foam::fieldToCell::applyToSet
         false
     );
 
-    if (!fieldObject.headerOk())
+    // Note: should check for volScalarField but that introduces depencendy
+    //       on volMesh so just use another type with processor-local scope
+    if (!fieldObject.typeHeaderOk<labelIOList>(false))
     {
         WarningInFunction
             << "Cannot read field " << fieldName_
@@ -198,7 +200,7 @@ void Foam::fieldToCell::applyToSet
     }
     else if (fieldObject.headerClassName() == "volScalarField")
     {
-        IFstream str(fieldObject.filePath());
+        IFstream str(typeFilePath<labelIOList>(fieldObject));
 
         // Read dictionary
         fieldDictionary fieldDict(fieldObject, fieldObject.headerClassName());
@@ -209,7 +211,7 @@ void Foam::fieldToCell::applyToSet
     }
     else if (fieldObject.headerClassName() == "volVectorField")
     {
-        IFstream str(fieldObject.filePath());
+        IFstream str(typeFilePath<labelIOList>(fieldObject));
 
         // Read dictionary
         fieldDictionary fieldDict(fieldObject, fieldObject.headerClassName());
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 9551827c2..4892ff617 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,13 +248,14 @@ bool cellZoneSet::writeObject
 (
     IOstream::streamFormat s,
     IOstream::versionNumber v,
-    IOstream::compressionType c
+    IOstream::compressionType c,
+    const bool valid
 ) const
 {
     // Write shadow cellSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = cellSet::typeName;
-    bool ok = cellSet::writeObject(s, v, c);
+    bool ok = cellSet::writeObject(s, v, c, valid);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify cellZone
@@ -284,7 +285,7 @@ bool cellZoneSet::writeObject
     }
     cellZones.clearAddressing();
 
-    return ok && cellZones.write();
+    return ok && cellZones.write(valid);
 }
 
 
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/sets/topoSets/cellZoneSet.H
index ee7a3ebb6..9df3c0c4d 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.H
+++ b/src/meshTools/sets/topoSets/cellZoneSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,8 @@ public:
         (
             IOstream::streamFormat,
             IOstream::versionNumber,
-            IOstream::compressionType
+            IOstream::compressionType,
+            const bool valid
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index 608109f7d..39561a939 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -463,13 +463,14 @@ bool faceZoneSet::writeObject
 (
     IOstream::streamFormat s,
     IOstream::versionNumber v,
-    IOstream::compressionType c
+    IOstream::compressionType c,
+    const bool valid
 ) const
 {
     // Write shadow faceSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = faceSet::typeName;
-    bool ok = faceSet::writeObject(s, v, c);
+    bool ok = faceSet::writeObject(s, v, c, valid);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify faceZone
@@ -500,7 +501,7 @@ bool faceZoneSet::writeObject
     }
     faceZones.clearAddressing();
 
-    return ok && faceZones.write();
+    return ok && faceZones.write(valid);
 }
 
 
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/sets/topoSets/faceZoneSet.H
index 35a013304..375d0b969 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.H
+++ b/src/meshTools/sets/topoSets/faceZoneSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,7 +159,8 @@ public:
         (
             IOstream::streamFormat,
             IOstream::versionNumber,
-            IOstream::compressionType
+            IOstream::compressionType,
+            const bool valid
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 726dc7777..3c8989c5f 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -249,13 +249,14 @@ bool pointZoneSet::writeObject
 (
     IOstream::streamFormat s,
     IOstream::versionNumber v,
-    IOstream::compressionType c
+    IOstream::compressionType c,
+    const bool valid
 ) const
 {
     // Write shadow pointSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = pointSet::typeName;
-    bool ok = pointSet::writeObject(s, v, c);
+    bool ok = pointSet::writeObject(s, v, c, valid);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify pointZone
@@ -285,7 +286,7 @@ bool pointZoneSet::writeObject
     }
     pointZones.clearAddressing();
 
-    return ok && pointZones.write();
+    return ok && pointZones.write(valid);
 }
 
 
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/sets/topoSets/pointZoneSet.H
index daaf4bdc0..47823e2de 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.H
+++ b/src/meshTools/sets/topoSets/pointZoneSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,8 @@ public:
         (
             IOstream::streamFormat,
             IOstream::versionNumber,
-            IOstream::compressionType
+            IOstream::compressionType,
+            const bool valid
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 2887e057a..6f13f9729 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1334,7 +1334,6 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
 
 Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
 :
-    //triSurfaceMesh(io),
     triSurfaceMesh
     (
         IOobject
@@ -1346,7 +1345,8 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
             io.readOpt(),
             io.writeOpt(),
             io.registerObject()
-        )
+        ),
+        false
     ),
     dict_
     (
@@ -1429,7 +1429,8 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
             io.writeOpt(),
             io.registerObject()
         ),
-        dict
+        dict,
+        false
     ),
     dict_
     (
@@ -2376,7 +2377,8 @@ bool Foam::distributedTriSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     // Make sure dictionary goes to same directory as surface
@@ -2403,7 +2405,7 @@ bool Foam::distributedTriSurfaceMesh::writeObject
     }
 
     // Dictionary needs to be written in ascii - binary output not supported.
-    return dict_.writeObject(IOstream::ASCII, ver, cmp);
+    return dict_.writeObject(IOstream::ASCII, ver, cmp, true);
 }
 
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index bbec71057..fce2ecb89 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -454,12 +454,33 @@ public:
             (
                 IOstream::streamFormat fmt,
                 IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::compressionType cmp,
+                const bool valid
             ) const;
 
+            //- Is object global
+            virtual bool global() const
+            {
+                return false;
+            }
+
+            //- Return complete path + object name if the file exists
+            //  either in the case/processor or case otherwise null
+            virtual fileName filePath() const
+            {
+                return searchableSurface::localFilePath(type());
+            }
 };
 
 
+//- Template function for obtaining global status
+template<>
+inline bool typeGlobal<distributedTriSurfaceMesh>()
+{
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index 960a65d76..eea4d3865 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ Foam::tmp<Foam::IOField<Type>> Foam::reconstructLagrangianField
             IOobject::NO_WRITE
         );
 
-        if (localIOobject.headerOk())
+        if (localIOobject.typeHeaderOk<IOField<Type>>(true))
         {
             IOField<Type> fieldi(localIOobject);
 
@@ -130,7 +130,14 @@ Foam::reconstructLagrangianFieldField
             IOobject::NO_WRITE
         );
 
-        if (localIOobject.headerOk())
+        if
+        (
+            localIOobject.typeHeaderOk<CompactIOField<Field<Type>, Type>>
+            (
+                false
+            )
+         || localIOobject.typeHeaderOk<IOField<Field<Type>>>(false)
+        )
         {
             CompactIOField<Field<Type>, Type> fieldi(localIOobject);
 
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 90397edfa..299dffa7b 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -508,7 +508,8 @@ void Foam::regionModels::regionModel::evolve()
             (
                 IOstream::ASCII,
                 IOstream::currentVersion,
-                time_.writeCompression()
+                time_.writeCompression(),
+                true
             );
         }
     }
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 7854762a8..3676f8dea 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -97,7 +97,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
             mesh.time().timeName(),
             "uniform",
             mesh
-        ).headerOk()
+        ).typeHeaderOk<IOdictionary>(true)
       ? IOdictionary
         (
             IOobject
@@ -338,7 +338,8 @@ bool Foam::rigidBodyMeshMotion::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     IOdictionary dict
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index d2c85bb73..454c98191 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -169,7 +169,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index f6476e46a..6434e69fb 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
             mesh.time().timeName(),
             "uniform",
             mesh
-        ).headerOk()
+        ).typeHeaderOk<IOdictionary>(true)
       ? IOdictionary
         (
             IOobject
@@ -282,7 +282,8 @@ bool Foam::rigidBodyMeshMotionSolver::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     IOdictionary dict
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
index 26dfb2189..5d820cddf 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,7 +159,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 613499533..5e103fee8 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,6 +213,8 @@ Foam::label Foam::probes::prepare()
         {
             probeDir = mesh_.time().path()/probeSubDir;
         }
+        // Remove ".."
+        probeDir.clean();
 
         // ignore known fields, close streams for fields that no longer exist
         forAllIter(HashPtrTable<OFstream>, probeFilePtrs_, iter)
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index e1bc650aa..01acb58a0 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,6 +175,8 @@ Foam::sampledSets::sampledSets
     {
         outputPath_ = outputPath_/mesh_.name();
     }
+    // Remove ".."
+    outputPath_.clean();
 
     read(dict);
 }
@@ -209,6 +211,8 @@ Foam::sampledSets::sampledSets
     {
         outputPath_ = outputPath_/mesh_.name();
     }
+    // Remove ".."
+    outputPath_.clean();
 
     read(dict);
 }
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 88966077d..d312cc770 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
                 false
             );
 
-            if (vfHeader.headerOk())
+            if (vfHeader.typeHeaderOk<volScalarField>(true))
             {
                 storedVolFieldPtr_.reset
                 (
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 86d88a9e0..0979103f2 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,6 +127,8 @@ Foam::sampledSurfaces::sampledSurfaces
     {
         outputPath_ = mesh_.time().path()/"postProcessing"/name;
     }
+    // Remove ".."
+    outputPath_.clean();
 
     read(dict);
 }
@@ -158,6 +160,8 @@ Foam::sampledSurfaces::sampledSurfaces
     {
         outputPath_ = mesh_.time().path()/"postProcessing"/name;
     }
+    // Remove ".."
+    outputPath_.clean();
 
     read(dict);
 }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index 12768a30d..cacc1c8a9 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
             mesh.time().timeName(),
             "uniform",
             mesh
-        ).headerOk()
+        ).typeHeaderOk<IOdictionary>(true)
       ? IOdictionary
         (
             IOobject
@@ -256,7 +256,8 @@ bool Foam::sixDoFRigidBodyMotionSolver::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
-    IOstream::compressionType cmp
+    IOstream::compressionType cmp,
+    const bool valid
 ) const
 {
     IOdictionary dict
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
index 81022fd5c..d82f291ae 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,7 +135,8 @@ public:
         (
             IOstream::streamFormat fmt,
             IOstream::versionNumber ver,
-            IOstream::compressionType cmp
+            IOstream::compressionType cmp,
+            const bool valid
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
index d2da9b19e..e1a3888a4 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
@@ -100,7 +100,7 @@ Foam::TDACChemistryModel<CompType, ThermoType>::TDACChemistryModel
 
             // Check if the species file is provided, if not set inactive
             // and NO_WRITE
-            if (!header.headerOk())
+            if (!header.typeHeaderOk<volScalarField>(true))
             {
                 composition.setInactive(i);
                 this->Y()[i].writeOpt() = IOobject::NO_WRITE;
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 2efa48026..76835c76c 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -151,7 +151,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
         );
 
         // Check if field exists and can be read
-        if (IHeader.headerOk())
+        if (IHeader.typeHeaderOk<volScalarField>(true))
         {
             ILambda_.set
             (
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
index 368326d46..49e62cab7 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
@@ -59,7 +59,7 @@ Foam::IOobject Foam::radiation::radiationModel::createIOobject
         IOobject::NO_WRITE
     );
 
-    if (io.headerOk())
+    if (io.typeHeaderOk<IOdictionary>(true))
     {
         io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
         return io;
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
index 1622d6093..c58d63295 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::radiation::radiationModel::New
     );
 
     word modelType("none");
-    if (radIO.headerOk())
+    if (radIO.typeHeaderOk<IOdictionary>(false))
     {
         IOdictionary(radIO).lookup("radiationModel") >> modelType;
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
index 591d8283f..2f9a212bf 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,8 +58,8 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
             IOobject::NO_READ
         );
 
-        // Check if field exists and can be read
-        if (header.headerOk())
+        // check if field exists and can be read
+        if (header.typeHeaderOk<volScalarField>(true))
         {
             Y_.set
             (
@@ -85,32 +85,45 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
             {
                 word YdefaultName(IOobject::groupName("Ydefault", phaseName));
 
-                tYdefault = new volScalarField
+                IOobject timeIO
                 (
-                    IOobject
-                    (
-                        YdefaultName,
-                        exists
-                        (
-                            mesh.time().path()/mesh.time().timeName()
-                           /YdefaultName
-                        )
-                      ? mesh.time().timeName()
-                      : (
-                            exists
-                            (
-                                mesh.time().path()/mesh.time().constant()
-                               /YdefaultName
-                            )
-                          ? mesh.time().constant()
-                          : Time::timeName(0)
-                        ),
-                        mesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    mesh
+                    YdefaultName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
                 );
+
+                IOobject constantIO
+                (
+                    YdefaultName,
+                    mesh.time().constant(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                );
+
+                IOobject time0IO
+                (
+                    YdefaultName,
+                    Time::timeName(0),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                );
+
+                if (timeIO.typeHeaderOk<volScalarField>(true))
+                {
+                    tYdefault = new volScalarField(timeIO, mesh);
+                }
+                else if (constantIO.typeHeaderOk<volScalarField>(true))
+                {
+                    tYdefault = new volScalarField(constantIO, mesh);
+                }
+                else
+                {
+                    tYdefault = new volScalarField(time0IO, mesh);
+                }
             }
 
             Y_.set
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index be5ab642c..4f7771456 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ pyrolysisChemistryModel
         );
 
         // check if field exists and can be read
-        if (header.headerOk())
+        if (header.typeHeaderOk<volScalarField>(true))
         {
             Ys0_.set
             (
diff --git a/tutorials/IO/fileHandler/0/U b/tutorials/IO/fileHandler/0/U
new file mode 100644
index 000000000..75ed42fbd
--- /dev/null
+++ b/tutorials/IO/fileHandler/0/U
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    outlet
+    {
+        type            zeroGradient;
+        value           uniform (0 0 0);
+    }
+    walls
+    {
+        type            noSlip;
+    }
+    frontAndBack
+    {
+        type            noSlip;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/Allrun b/tutorials/IO/fileHandler/Allrun
new file mode 100755
index 000000000..d032798ab
--- /dev/null
+++ b/tutorials/IO/fileHandler/Allrun
@@ -0,0 +1,28 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+
+#- Test writing collated format
+runApplication decomposePar -fileHandler collated
+runParallel `getApplication` -fileHandler collated
+runApplication reconstructPar -latestTime -fileHandler collated
+
+#- Delete collated files
+rm -rf processors
+
+#- Test writing uncollated format
+runApplication -s uncollated decomposePar -fileHandler uncollated
+runParallel -s uncollated `getApplication` -fileHandler uncollated
+
+#- Restart from uncollated
+runParallel -s collated `getApplication` -fileHandler collated
+runApplication -s collated reconstructPar -latestTime -fileHandler collated
+
+#- Convert the parallel format to uncollated
+runParallel foamFormatConvert -fileHandler uncollated
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/IO/fileHandler/constant/g b/tutorials/IO/fileHandler/constant/g
new file mode 100644
index 000000000..0cc222ca3
--- /dev/null
+++ b/tutorials/IO/fileHandler/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudPositions b/tutorials/IO/fileHandler/constant/kinematicCloudPositions
new file mode 100644
index 000000000..1e2be4ebc
--- /dev/null
+++ b/tutorials/IO/fileHandler/constant/kinematicCloudPositions
@@ -0,0 +1,92 @@
+/*--------------------------------*- 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       vectorField;
+    object      kinematicCloudPositions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+(
+(0.286 0.077 0.0032)
+(0.286 0.083 0.0032)
+(0.286 0.089 0.0032)
+(0.286 0.095 0.0032)
+(0.286 0.101 0.0032)
+(0.286 0.107 0.0032)
+(0.286 0.113 0.0032)
+(0.286 0.119 0.0032)
+(0.286 0.125 0.0032)
+(0.286 0.131 0.0032)
+(0.286 0.137 0.0032)
+(0.286 0.143 0.0032)
+(0.286 0.149 0.0032)
+(0.286 0.155 0.0032)
+(0.286 0.161 0.0032)
+(0.286 0.167 0.0032)
+(0.286 0.173 0.0032)
+(0.286 0.179 0.0032)
+(0.286 0.185 0.0032)
+(0.286 0.191 0.0032)
+(0.286 0.197 0.0032)
+(0.286 0.203 0.0032)
+(0.286 0.209 0.0032)
+(0.286 0.215 0.0032)
+(0.286 0.221 0.0032)
+(0.286 0.227 0.0032)
+(0.286 0.233 0.0032)
+(0.286 0.239 0.0032)
+(0.286 0.245 0.0032)
+(0.286 0.251 0.0032)
+(0.286 0.257 0.0032)
+(0.286 0.263 0.0032)
+(0.286 0.269 0.0032)
+(0.286 0.275 0.0032)
+(0.286 0.281 0.0032)
+(0.286 0.287 0.0032)
+(0.286 0.293 0.0032)
+(0.286 0.299 0.0032)
+(0.286 0.305 0.0032)
+(0.286 0.311 0.0032)
+(0.286 0.317 0.0032)
+(0.286 0.323 0.0032)
+(0.286 0.329 0.0032)
+(0.286 0.335 0.0032)
+(0.286 0.341 0.0032)
+(0.286 0.347 0.0032)
+(0.286 0.353 0.0032)
+(0.286 0.359 0.0032)
+(0.286 0.365 0.0032)
+(0.286 0.371 0.0032)
+(0.286 0.377 0.0032)
+(0.286 0.383 0.0032)
+(0.286 0.389 0.0032)
+(0.286 0.395 0.0032)
+(0.286 0.401 0.0032)
+(0.286 0.407 0.0032)
+(0.286 0.413 0.0032)
+(0.286 0.419 0.0032)
+(0.286 0.425 0.0032)
+(0.286 0.431 0.0032)
+(0.286 0.437 0.0032)
+(0.286 0.443 0.0032)
+(0.286 0.449 0.0032)
+(0.286 0.455 0.0032)
+(0.286 0.461 0.0032)
+(0.286 0.467 0.0032)
+(0.286 0.473 0.0032)
+(0.286 0.479 0.0032)
+(0.286 0.485 0.0032)
+(0.286 0.491 0.0032)
+(0.286 0.497 0.0032)
+)
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudProperties b/tutorials/IO/fileHandler/constant/kinematicCloudProperties
new file mode 100644
index 000000000..41b8c64e8
--- /dev/null
+++ b/tutorials/IO/fileHandler/constant/kinematicCloudProperties
@@ -0,0 +1,138 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      kinematicCloudProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+    active          true;
+    coupled         false;
+    transient       yes;
+    cellValueSourceCorrection off;
+    maxCo           0.3;
+
+    interpolationSchemes
+    {
+        rho             cell;
+        U               cellPoint;
+        mu              cell;
+    }
+
+    integrationSchemes
+    {
+        U               Euler;
+    }
+}
+
+constantProperties
+{
+    rho0            964;
+    youngsModulus   6e8;
+    poissonsRatio   0.35;
+}
+
+subModels
+{
+    particleForces
+    {
+        sphereDrag;
+        gravity;
+    }
+
+    injectionModels
+    {
+        model1
+        {
+            type            manualInjection;
+            massTotal       0;
+            parcelBasisType fixed;
+            nParticle       1;
+            SOI             0;
+            positionsFile   "kinematicCloudPositions";
+            U0              (0 0 0);
+            sizeDistribution
+            {
+                type        fixedValue;
+                fixedValueDistribution
+                {
+                    value   0.006;
+                }
+            }
+        }
+    }
+
+    dispersionModel none;
+
+    patchInteractionModel none;
+
+    surfaceFilmModel none;
+
+    stochasticCollisionModel none;
+
+    collisionModel pairCollision;
+
+    pairCollisionCoeffs
+    {
+        // Maximum possible particle diameter expected at any time
+        maxInteractionDistance  0.006;
+
+        writeReferredParticleCloud no;
+
+        pairModel pairSpringSliderDashpot;
+
+        pairSpringSliderDashpotCoeffs
+        {
+            useEquivalentSize   no;
+            alpha               0.12;
+            b                   1.5;
+            mu                  0.52;
+            cohesionEnergyDensity 0;
+            collisionResolutionSteps 12;
+        };
+
+        wallModel    wallLocalSpringSliderDashpot;
+
+        wallLocalSpringSliderDashpotCoeffs
+        {
+            useEquivalentSize no;
+            collisionResolutionSteps 12;
+            walls
+            {
+                youngsModulus   1e10;
+                poissonsRatio   0.23;
+                alpha           0.12;
+                b               1.5;
+                mu              0.43;
+                cohesionEnergyDensity 0;
+            }
+            frontAndBack
+            {
+                youngsModulus   1e10;
+                poissonsRatio   0.23;
+                alpha           0.12;
+                b               1.5;
+                mu              0.1;
+                cohesionEnergyDensity 0;
+            }
+        };
+    }
+}
+
+
+cloudFunctions
+{}
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/constant/transportProperties b/tutorials/IO/fileHandler/constant/transportProperties
new file mode 100644
index 000000000..dbbab9e9f
--- /dev/null
+++ b/tutorials/IO/fileHandler/constant/transportProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+rhoInf          [1 -3 0 0 0 0 0] 1.2;
+
+transportModel  Newtonian;
+
+nu              [0 2 -1 0 0 0 0] 1e-05;
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/constant/turbulenceProperties b/tutorials/IO/fileHandler/constant/turbulenceProperties
new file mode 100644
index 000000000..c2c3b28a1
--- /dev/null
+++ b/tutorials/IO/fileHandler/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/system/blockMeshDict b/tutorials/IO/fileHandler/system/blockMeshDict
new file mode 100644
index 000000000..359a48779
--- /dev/null
+++ b/tutorials/IO/fileHandler/system/blockMeshDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.001;
+
+vertices
+(
+    (0 77.9423 6.2)
+    (135 0 6.2)
+    (165 0 6.2)
+    (300 77.9423 6.2)
+    (300 500 6.2)
+    (0 500 6.2)
+    (0 77.9423 0)
+    (135 0 0)
+    (165 0 0)
+    (300 77.9423 0)
+    (300 500 0)
+    (0 500 0)
+);
+
+
+blocks
+(
+    hex (6 9 10 11 0 3 4 5 ) (20 40 1) simpleGrading (1 1 1)
+    hex (7 8 9 6 1 2 3 0) (20 8 1) simpleGrading (1 1 1)
+);
+
+boundary
+(
+    walls
+    {
+        type wall;
+        faces
+        (
+            (1 7 8 2)
+            (0 6 7 1)
+            (2 8 9 3)
+            (0 5 11 6)
+            (3 4 10 9)
+            (4 10 11 5)
+        );
+    }
+
+    frontAndBack
+    {
+        type wall;
+        faces
+        (
+            (0 3 4 5)
+            (1 2 3 0)
+            (6 11 10 9)
+            (6 9 8 7)
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/system/controlDict b/tutorials/IO/fileHandler/system/controlDict
new file mode 100644
index 000000000..2ac8dc578
--- /dev/null
+++ b/tutorials/IO/fileHandler/system/controlDict
@@ -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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoUncoupledKinematicParcelFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          writeNow;
+
+endTime         0.25;
+
+deltaT          5e-5;
+
+writeControl    runTime;
+
+writeInterval   0.05;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+// OptimisationSwitches
+// {
+//     fileHandler collated;
+// }
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/system/decomposeParDict b/tutorials/IO/fileHandler/system/decomposeParDict
new file mode 100644
index 000000000..0f07bb6aa
--- /dev/null
+++ b/tutorials/IO/fileHandler/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          simple;
+
+simpleCoeffs
+{
+    n               (4 1 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (4 1 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/system/fvSchemes b/tutorials/IO/fileHandler/system/fvSchemes
new file mode 100644
index 000000000..12c112d4e
--- /dev/null
+++ b/tutorials/IO/fileHandler/system/fvSchemes
@@ -0,0 +1,43 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         none;
+}
+
+gradSchemes
+{
+    default         none;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default         none;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/IO/fileHandler/system/fvSolution b/tutorials/IO/fileHandler/system/fvSolution
new file mode 100644
index 000000000..740eb61a4
--- /dev/null
+++ b/tutorials/IO/fileHandler/system/fvSolution
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict
index e318281fa..d4f1eeb81 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict
@@ -72,11 +72,10 @@ boundary
         type empty;
         faces
         (
-	    (0 3 2 1)
-	    (4 5 6 7)
+            (0 3 2 1)
+            (4 5 6 7)
         );
     }
-
 );
 
 mergePatchPairs
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index de3f6389f..fac107b28 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -5,7 +5,23 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
+
+# Serial
 runApplication snappyHexMesh -overwrite
 runApplication `getApplication`
 
+## Parallel
+#runApplication decomposePar -fileHandler collated
+#runParallel snappyHexMesh -overwrite -fileHandler collated
+## Remove any include files from the field dictionaries
+#(   mkdir -p processors/0 && \
+#    cd 0 && \
+#    for f in *; do [ -f "$f" ] && \
+#    foamDictionary "$f" > "../processors/0/$f"; done \
+#)
+#
+#runParallel `getApplication` -fileHandler collated
+#runApplication reconstructParMesh -constant  -mergeTol 1e-6
+#runApplication reconstructPar
+
 #------------------------------------------------------------------------------