diff --git a/README b/README
index 329483abb77f6d042e8fb63e3ee280be9cea65ac..720af758ab28c76c8c9b2b5de7bb87f98fbc700f 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 #
 #+TITLE:                       *cfMesh README*
 #+AUTHOR:                      Franjo Juretic.
-#+DATE:                           May 2015
-#+LINK:                  http://www.c-fields.com
+#+DATE:                           October 2016
+#+LINK:                  http://www.cfmesh.com
 #+OPTIONS:
 
 cfMesh is a library for mesh generation built on OpenFOAM.
diff --git a/executables/cartesian2DMesh/Make/options b/executables/cartesian2DMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/executables/cartesian2DMesh/Make/options
+++ b/executables/cartesian2DMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/executables/cartesianMesh/Make/options b/executables/cartesianMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/executables/cartesianMesh/Make/options
+++ b/executables/cartesianMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/executables/pMesh/Make/options b/executables/pMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100755
--- a/executables/pMesh/Make/options
+++ b/executables/pMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/executables/tetMesh/Make/options b/executables/tetMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/executables/tetMesh/Make/options
+++ b/executables/tetMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
index 86692a6bcf2d8a849917cc228cf8114aca8fc52b..9708b64bce8a2369f57ce89659df9f056ab57571 100644
--- a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
+++ b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices()
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 globalLabels.byteSize()
             );
@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices()
             labelList receivedData;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
index 40cf3a866411abc15e3dffe87ee6f4fcddf5631e..b855808025391e8cc05566466b6b101fb35fc246 100644
--- a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
+++ b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces()
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces()
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C b/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C
index df4ed32dc437c1346ac6b325e0b2500e793c61fb..8ba5fc0786fec5eb2c2d0232dc47d7a2fc94fbce 100644
--- a/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C
+++ b/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C
@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 decFace.byteSize()
             );
@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
index 5ba966482271e920719a313e247bdcffc1e2b5bd..6e0546597bc2b8bfb9c93137ccc6aa37a389043e 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
     {
         //- receive the data
         List<T> receivedData;
-        IPstream fromOtherProc(Pstream::blocking, above[aboveI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]);
         fromOtherProc >> receivedData;
 
         gop(receivedData);
@@ -94,7 +94,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
         sop(dts);
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 
@@ -104,7 +104,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
     {
         //- receive the data
         List<T> receivedData;
-        IPstream fromOtherProc(Pstream::blocking, below[belowI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]);
         fromOtherProc >> receivedData;
 
         gop(receivedData);
@@ -119,7 +119,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
         sop(dts);
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 }
@@ -143,14 +143,14 @@ void exchangeMap
     labelHashSet receiveData;
     for(iter=m.begin();iter!=m.end();++iter)
     {
-        OPstream toOtherProc(Pstream::blocking, iter->first, sizeof(label));
+        OPstream toOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label));
 
         toOtherProc << iter->second.size();
     }
 
     for(iter=m.begin();iter!=m.end();++iter)
     {
-        IPstream fromOtherProc(Pstream::blocking, iter->first, sizeof(label));
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label));
 
         label s;
         fromOtherProc >> s;
@@ -159,7 +159,7 @@ void exchangeMap
             receiveData.insert(iter->first);
     }
 
-    if( commsType == Pstream::blocking )
+    if( commsType == UPstream::commsTypes::blocking )
     {
         //- start with blocking type of send and received operation
 
@@ -173,7 +173,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 iter->first,
                 dts.byteSize()
             );
@@ -186,11 +186,11 @@ void exchangeMap
             if( !receiveData.found(iter->first) )
                 continue;
 
-            IPstream fromOtherProc(Pstream::blocking, iter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
             data.appendFromStream(fromOtherProc);
         }
     }
-    else if( commsType == Pstream::scheduled )
+    else if( commsType == UPstream::commsTypes::scheduled )
     {
         //- start with scheduled data transfer
         //- this type of transfer is intended for long messages because
@@ -205,7 +205,7 @@ void exchangeMap
                 continue;
 
             //List<T> receive;
-            IPstream fromOtherProc(Pstream::scheduled, iter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first);
             //fromOtherProc >> receive;
             data.appendFromStream(fromOtherProc);
 
@@ -226,7 +226,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::scheduled,
+                UPstream::commsTypes::scheduled,
                 iter->first,
                 dts.byteSize()
             );
@@ -243,7 +243,7 @@ void exchangeMap
             if( !receiveData.found(riter->first) )
                 continue;
 
-            IPstream fromOtherProc(Pstream::scheduled, riter->first);
+            IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first);
             //List<T> receive;
             //fromOtherProc >> receive;
             data.appendFromStream(fromOtherProc);
@@ -265,7 +265,7 @@ void exchangeMap
 
             OPstream toOtherProc
             (
-                Pstream::scheduled,
+                UPstream::commsTypes::scheduled,
                 riter->first,
                 dts.byteSize()
             );
@@ -317,7 +317,7 @@ void exchangeMap
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             iter->first,
             dataToSend.byteSize()
         );
@@ -330,7 +330,7 @@ void exchangeMap
         mOut.insert(std::make_pair(iter->first, List<T>()));
         List<T>& dataToReceive = mOut[iter->first];
 
-        IPstream fromOtherProc(Pstream::blocking, iter->first);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first);
         fromOtherProc >> dataToReceive;
     }
 }
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H
index e2b89119c16c2234f2c3a5fc6573d9a346126b51..4748c73e0c0dc2e6189c423428883fa5f4e89557 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H
@@ -65,7 +65,7 @@ void exchangeMap
 (
     const std::map<label, ListType>&,
     LongList<T>&,
-    const Pstream::commsTypes commsType = Pstream::blocking
+    const UPstream::commsTypes commsType = UPstream::commsTypes::blocking
 );
 
 //- sends the data stored in a map to other processors and receives the data
diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
index c82d95f645d08b44775df3525333519c47c1a752..b36560e620fe3655fa587117aa72c2a9bde9d9e0 100644
--- a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
+++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 pBnd[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 pBnd[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C
index 97c5e5a2ca09d91645892fd8fc5c2a2f1cc435b3..3c58b071f9ec64255e96b518bef5c89406878a93 100644
--- a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C
+++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C
@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo(),
             dataToSend.byteSize()
         );
@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets
 
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
 
diff --git a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
index 4618d55ed3f9c4f8d395fbe5c61eceea9f222df5..eec105dab5d6d26ca30af334a5504c5d2ca78c90 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
diff --git a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
index d260baa3058eb9b7ecd4a396b8cfc7cd8b05af59..13b64ce45f266fe71d49b9b9e93c4491825a2601 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
@@ -1566,7 +1566,7 @@ bool checkCellPartTetrahedra
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBnd[patchI].neiProcNo(),
                 sendData.byteSize()
             );
@@ -1580,7 +1580,7 @@ bool checkCellPartTetrahedra
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBnd[patchI].neiProcNo()
             );
 
@@ -1667,7 +1667,7 @@ void checkFaceDotProduct
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 cCentres.byteSize()
             );
@@ -1680,7 +1680,7 @@ void checkFaceDotProduct
             vectorField otherCentres;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2076,7 +2076,7 @@ bool checkFacePyramids
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 markedFaces.byteSize()
             );
@@ -2089,7 +2089,7 @@ bool checkFacePyramids
             labelList receivedData;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtheProc >> receivedData;
@@ -2179,7 +2179,7 @@ void checkFaceSkewness
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 cCentres.byteSize()
             );
@@ -2194,7 +2194,7 @@ void checkFaceSkewness
             vectorField otherCentres;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2421,7 +2421,7 @@ void checkFaceUniformity
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dst.byteSize()
             );
@@ -2436,7 +2436,7 @@ void checkFaceUniformity
             scalarField otherDst;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -2885,7 +2885,7 @@ bool checkFaceFlatness
         {
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sizeof(label)
             );
@@ -2898,7 +2898,7 @@ bool checkFaceFlatness
         {
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 sizeof(label)
             );
@@ -2914,7 +2914,7 @@ bool checkFaceFlatness
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 markedFaces[patchI].byteSize()
             );
@@ -2930,7 +2930,7 @@ bool checkFaceFlatness
             labelList receivedData;
             IPstream fromOtheProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 nMarkedOnOtherProcs[patchI]*sizeof(label)
             );
diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
index 13f28d50dbbdc6a91852f4e5ffeed27ac8c2f7c9..29659092e68a48ebcb60c37dcd400b760628fa16 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
@@ -87,7 +87,7 @@ void polyMeshGenModifier::addBufferCells()
         
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -100,7 +100,7 @@ void polyMeshGenModifier::addBufferCells()
         List<labelledPoint> receivedPoints;
         IPstream fromOtherProc
         (
-            IPstream::blocking,
+            UIPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -154,7 +154,7 @@ void polyMeshGenModifier::addBufferCells()
         
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
@@ -171,7 +171,7 @@ void polyMeshGenModifier::addBufferCells()
         
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procBoundaries[patchI].neiProcNo()
         );
         
diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
index 89a5487ac6c1d0a6ac1ebda87f52c63a82328a78..91a12b1182254af6da52fd5eae84f60bb32e3c71 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
@@ -126,7 +126,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 removeProcFace.byteSize()
             );
@@ -142,7 +142,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
             boolList removeOtherProcFace;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtherProc >> removeOtherProcFace;
diff --git a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
index 184ce372c24fab9a3efa0d4cece7fb9392d7bc98..d9df2890001ba1f25bed1146bc43add5f0d84315 100644
--- a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
+++ b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
@@ -170,7 +170,7 @@ inline bool meshSubset::operator==(const meshSubset& ms) const
 {
     if( ms.name_ != name_ )
         return false;
-    if( ms.type_ != ms.type_ )
+    if( ms.type_ != type_ )
         return false;
 
     forAllConstIter(std::set<label>, data_, it)
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
index 854fd1758fafb2eeedaa9afecc20ad75fb34358c..e96451bb32aead5028c517f0b4dcab2ee8c244a5 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
@@ -171,7 +171,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
     {
         //- receive the data
         labelList receivedLabels;
-        IPstream fromOtherProc(Pstream::blocking, above[aboveI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]);
         fromOtherProc >> receivedLabels;
 
         label counter(0);
@@ -245,7 +245,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
         }
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 
@@ -255,7 +255,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
     {
         //- receive the data
         labelList receivedLabels;
-        IPstream fromOtherProc(Pstream::blocking, below[belowI]);
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]);
         fromOtherProc >> receivedLabels;
 
         label counter(0);
@@ -329,7 +329,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
         }
 
         //- send the data
-        OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
+        OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
         toOtherProc << dts;
     }
 }
@@ -437,7 +437,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const
 
     //- exchange the data with other processors
     LongList<meshOctreeCubeBasic> rLeaves;
-    help::exchangeMap(exchangeData, rLeaves, Pstream::scheduled);
+    help::exchangeMap(exchangeData, rLeaves, UPstream::commsTypes::scheduled);
 
     //- update the local data
     forAll(rLeaves, i)
@@ -479,9 +479,9 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const
 
     //- exchange the data
     rLeaves.clear();
-    help::exchangeMap(exchangeData, rLeaves, Pstream::scheduled);
+    help::exchangeMap(exchangeData, rLeaves, UPstream::commsTypes::scheduled);
     labelLongList rLabels;
-    help::exchangeMap(exchangeLabels, rLabels, Pstream::scheduled);
+    help::exchangeMap(exchangeLabels, rLabels, UPstream::commsTypes::scheduled);
 
     if( rLeaves.size() != rLabels.size() )
         FatalErrorIn("void meshOctreeAddressing::calcGlobalLeafLabels() const")
@@ -526,7 +526,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const
 
     //- exchange the data
     rLabels.clear();
-    help::exchangeMap(exchangeLabels, rLabels, Pstream::scheduled);
+    help::exchangeMap(exchangeLabels, rLabels, UPstream::commsTypes::scheduled);
 
     //- update the local data
     label counter(0);
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
index 08f1f622d19b6063a259dc43164afb843293c262..b83b2b28792e11e1c8b76140c904f4a311bd2248 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
@@ -214,7 +214,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
 
         List<meshOctreeCubeBasic> mc;
 
-        IPstream fromOtherProc(Pstream::blocking, iter.key());
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key());
 
         fromOtherProc >> mc;
 
@@ -254,7 +254,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procI,
             sendCoordinates.byteSize()
         );
@@ -270,7 +270,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
 
         List<meshOctreeCubeBasic> mc;
 
-        IPstream fromOtherProc(Pstream::blocking, iter.key());
+        IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key());
 
         fromOtherProc >> mc;
 
@@ -309,7 +309,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             procI,
             sendCoordinates.byteSize()
         );
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
index f8af7917da8fd8023ffa7ebdb199119e0d5e2b2a..0cd4205106a1996533cf6f3e1040f8b60254d059 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
@@ -261,7 +261,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
 
     //- exchange data with other processors
     LongList<meshOctreeCubeBasic> receivedCoordinates;
-    help::exchangeMap(toProcs, receivedCoordinates, Pstream::blocking);
+    help::exchangeMap(toProcs, receivedCoordinates, UPstream::commsTypes::blocking);
 
     # ifdef OCTREE_DEBUG
     Pout << "Received " << receivedCoordinates.size()
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C
index 6e24fdec280866e852c68d569fbc8c0028fb9a83..d0ecdc62ae53ab677511a35d09c9d950a70e570d 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C
@@ -116,7 +116,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
     {
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             neiProcs_[neiProcI],
             sizeof(label)
         );
@@ -129,7 +129,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
     {
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             neiProcs_[neiProcI],
             sizeof(label)
         );
@@ -147,7 +147,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         dataToReceive.appendFromStream(fromOtherProc);
     }
 
@@ -159,7 +159,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- send data to other processor
-        OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         toOtherProc << toProcs[neiProcI];
     }
 
@@ -172,7 +172,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         dataToReceive.appendFromStream(fromOtherProc);
     }
 
@@ -184,7 +184,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- send data to other processor
-        OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         toOtherProc << toProcs[neiProcI];
     }
 }
@@ -268,7 +268,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
     {
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             neiProcs_[neiProcI],
             sizeof(label)
         );
@@ -281,7 +281,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
     {
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             neiProcs_[neiProcI],
             sizeof(label)
         );
@@ -299,7 +299,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
 
         dataToReceive.appendFromStream(fromOtherProc);
     }
@@ -312,7 +312,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- send data to other processor
-        OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         toOtherProc << toProcs[neiProcI];
     }
 
@@ -325,7 +325,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
 
         dataToReceive.appendFromStream(fromOtherProc);
     }
@@ -338,7 +338,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- send data to other processor
-        OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
         toOtherProc << toProcs[neiProcI];
     }
 
@@ -353,7 +353,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
 
         receivedRanges.appendFromStream(fromOtherProc);
     }
@@ -368,7 +368,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
         //- send data to other processor
         OPstream toOtherProc
         (
-            Pstream::scheduled,
+            UPstream::commsTypes::scheduled,
             neiProcs_[neiProcI],
             attributesToProcs[neiProcI].byteSize()
         );
@@ -385,7 +385,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
             continue;
 
         //- receive data from other processor
-        IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
+        IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
 
         receivedRanges.appendFromStream(fromOtherProc);
     }
@@ -400,7 +400,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
         //- send data to other processor
         OPstream toOtherProc
         (
-            Pstream::scheduled,
+            UPstream::commsTypes::scheduled,
             neiProcs_[neiProcI],
             attributesToProcs[neiProcI].byteSize()
         );
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H
index d3da6352eeab5284e97057289f86a192180e3b70..b188a0978d9259f1ec3b9a0570f6bcb439fd9ce8 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H
@@ -66,7 +66,7 @@ inline void meshOptimizer::lockCells(const labelListType& l)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -80,7 +80,7 @@ inline void meshOptimizer::lockCells(const labelListType& l)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -146,7 +146,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -160,7 +160,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
@@ -235,7 +235,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dataToSend.byteSize()
             );
@@ -249,7 +249,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp)
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
index cc571521dc70859e92db13464ad8345c75311564..5cc4de2526d416985c9da8cceb2ed72713652087 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
@@ -300,7 +300,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry
 
         OPstream toOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             pBnd[patchI].neiProcNo(),
             sendData.byteSize()
         );
@@ -314,7 +314,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry
 
         IPstream fromOtherProc
         (
-            Pstream::blocking,
+            UPstream::commsTypes::blocking,
             pBnd[patchI].neiProcNo()
         );
 
diff --git a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
index fbb5c00e696cdb1b0e76a7415fb395324e3c95dd..54c1c9496fa4374b19266e3d31a3938cec3307e2 100644
--- a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
+++ b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
@@ -121,7 +121,7 @@ public:
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 groupOwner.byteSize()
             );
@@ -138,7 +138,7 @@ public:
 
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
index 56df4fa23b2fe124faac80ed81d8f13574394ab4..e7784441e87c946c6351d1616f173faf41c9f24f 100644
--- a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
+++ b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
@@ -232,7 +232,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 globalLabels.byteSize()
             );
@@ -248,7 +248,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
             labelList receivedData;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
index ec8224ff1db6932a4b21c6a76b51837e0a8f849d..3553705a18f49600e159ffae34164261ca6b0fe0 100644
--- a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
+++ b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
@@ -204,7 +204,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells)
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 patchCellType.byteSize()
             );
@@ -217,7 +217,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells)
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
 
diff --git a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C
index ad368fe359f81890477b161dcfe286f3e26ca945..ddd48a8cd556f9e8c66fa3ad393811a1dabdbda3 100644
--- a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C
+++ b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C
@@ -260,7 +260,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 neiProcs[procI],
                 dataToSend.byteSize()
             );
@@ -270,7 +270,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces
         forAll(neiProcs, procI)
         {
             labelList receivedData;
-            IPstream fromOtherProc(Pstream::blocking, neiProcs[procI]);
+            IPstream fromOtherProc(UPstream::commsTypes::blocking, neiProcs[procI]);
                 fromOtherProc >> receivedData;
 
             label counter(0);
diff --git a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C
index 3b280547aee2e511018cd563d4dc1e9c0ce0535f..b730968d58f976dd38e830b2ffe2f378b41ee5b5 100644
--- a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C
+++ b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C
@@ -181,7 +181,7 @@ void topologicalCleaner::checkNonMappableFaces()
             //- send information about decomposed faces to other processor
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 decProcFace.byteSize()
             );
@@ -193,7 +193,7 @@ void topologicalCleaner::checkNonMappableFaces()
             boolList decOtherProc;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtherProc >> decOtherProc;
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
index e6e3f5ae6b9ba6c1cfb0843e751fe01422483594..ab62c4c480b4c8335e6446f8376fd59327ba734e 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
@@ -192,7 +192,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const
 
                 OPstream toOtherProc
                 (
-                    Pstream::blocking,
+                    UPstream::commsTypes::blocking,
                     procBoundaries[patchI].neiProcNo(),
                     dts.byteSize()
                 );
@@ -206,7 +206,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const
                 labelList receiveData;
                 IPstream fromOtherProc
                 (
-                    Pstream::blocking,
+                    UPstream::commsTypes::blocking,
                     procBoundaries[patchI].neiProcNo()
                 );
                 fromOtherProc >> receiveData;
@@ -1032,7 +1032,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dts.byteSize()
             );
@@ -1046,7 +1046,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const
             labelList receivedEdges;
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             fromOtherProc >> receivedEdges;
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
index b0c778fe70119b300f10b5e37151765469d1b23d..8d86e6f972c462ddd298002abe5e00f1dfbd0779 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
@@ -135,7 +135,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dts.byteSize()
             );
@@ -146,7 +146,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -250,7 +250,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dts.byteSize()
             );
@@ -261,7 +261,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -450,7 +450,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dts.byteSize()
             );
@@ -461,7 +461,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
@@ -586,7 +586,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
 
             OPstream toOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo(),
                 dts.byteSize()
             );
@@ -597,7 +597,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
         {
             IPstream fromOtherProc
             (
-                Pstream::blocking,
+                UPstream::commsTypes::blocking,
                 procBoundaries[patchI].neiProcNo()
             );
             labelList receivedData;
diff --git a/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C b/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
index b5d3f99bdde472ed52f96b303211060252c41234..5e0898349ca5146b2edb71b6825190093ecdcd83 100644
--- a/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
+++ b/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
@@ -116,7 +116,7 @@ void surfaceMorpherCells::findBoundaryVertices()
                 //- send the list of other processor
                 OPstream toOtherProc
                 (
-                    Pstream::blocking,
+                    UPstream::commsTypes::blocking,
                     procBoundaries[patchI].neiProcNo(),
                     bndVertsToSend.byteSize()
                 );
@@ -130,7 +130,7 @@ void surfaceMorpherCells::findBoundaryVertices()
                 labelList receivedBndNodes;
                 IPstream fromOtherProc
                 (
-                    Pstream::blocking,
+                    UPstream::commsTypes::blocking,
                     procBoundaries[patchI].neiProcNo()
                 );
                 fromOtherProc >> receivedBndNodes;
diff --git a/utilities/FLMAToSurface/Make/options b/utilities/FLMAToSurface/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/FLMAToSurface/Make/options
+++ b/utilities/FLMAToSurface/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/FMSToSurface/Make/options b/utilities/FMSToSurface/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/FMSToSurface/Make/options
+++ b/utilities/FMSToSurface/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/FMSToVTK/FMSToVTK.C b/utilities/FMSToVTK/FMSToVTK.C
index 9241bc6dde19a2ba4397a67b4903a17b79dc33e7..f37b39e32134a39b20af37153a2ab3846adaa1dc 100644
--- a/utilities/FMSToVTK/FMSToVTK.C
+++ b/utilities/FMSToVTK/FMSToVTK.C
@@ -78,7 +78,7 @@ void writePointsToVTK
     const fileName& fn,
     const string& title,
     const UList<point>& points,
-    unallocLabelList& addr
+    UList<label>& addr
 )
 {
     // Create subaddressed points
@@ -158,7 +158,7 @@ void writeEdgesToVTK
     const string& title,
     const UList<point>& points,
     const LongList<edge>& edges,
-    const unallocLabelList& addr
+    const UList<label>& addr
 )
 {
     // Remove unused points and create subaddressed edges
@@ -274,7 +274,7 @@ void writeFacetsToVTK
     const string& title,
     const pointField& points,
     const LongList<labelledTri>& facets,
-    const unallocLabelList& addr
+    const UList<label>& addr
 )
 {        
     // Remove unused points and create subaddressed facets
diff --git a/utilities/FMSToVTK/Make/options b/utilities/FMSToVTK/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/FMSToVTK/Make/options
+++ b/utilities/FMSToVTK/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/checkSurfaceMesh/Make/options b/utilities/checkSurfaceMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..b14fb5c7bf03b8a86cf239049f4b63f8635850b4 100644
--- a/utilities/checkSurfaceMesh/Make/options
+++ b/utilities/checkSurfaceMesh/Make/options
@@ -1,3 +1,17 @@
+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
+endif
+
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
diff --git a/utilities/copySurfaceParts/Make/options b/utilities/copySurfaceParts/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..3f326d676999019415a1647018f21f09b1d72b79 100644
--- a/utilities/copySurfaceParts/Make/options
+++ b/utilities/copySurfaceParts/Make/options
@@ -1,12 +1,18 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
+
 ifeq ($(WM_PROJECT), foam)
     VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
     ifeq ($(VER), 1)
diff --git a/utilities/extrudeEdgesInto2DSurface/Make/options b/utilities/extrudeEdgesInto2DSurface/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/extrudeEdgesInto2DSurface/Make/options
+++ b/utilities/extrudeEdgesInto2DSurface/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/generateBoundaryLayers/Make/options b/utilities/generateBoundaryLayers/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/generateBoundaryLayers/Make/options
+++ b/utilities/generateBoundaryLayers/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/importSurfaceAsSubset/Make/options b/utilities/importSurfaceAsSubset/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/importSurfaceAsSubset/Make/options
+++ b/utilities/importSurfaceAsSubset/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/improveMeshQuality/Make/options b/utilities/improveMeshQuality/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/improveMeshQuality/Make/options
+++ b/utilities/improveMeshQuality/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/improveSymmetryPlanes/Make/options b/utilities/improveSymmetryPlanes/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/improveSymmetryPlanes/Make/options
+++ b/utilities/improveSymmetryPlanes/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/mergeSurfacePatches/Make/options b/utilities/mergeSurfacePatches/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/mergeSurfacePatches/Make/options
+++ b/utilities/mergeSurfacePatches/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/mergeSurfacePatches/mergeSurfacePatches.C b/utilities/mergeSurfacePatches/mergeSurfacePatches.C
index e5218154846107ffd67a2b716538620491e96d2d..3357034540168e45ad606d0f3fac38780fd6d449 100644
--- a/utilities/mergeSurfacePatches/mergeSurfacePatches.C
+++ b/utilities/mergeSurfacePatches/mergeSurfacePatches.C
@@ -209,7 +209,7 @@ autoPtr<triSurf> mergeSurfacePatches
     label faceI = 0;
     forAll(patchAddr, patchI)
     {
-        const unallocLabelList& addr = patchAddr[patchI];
+        const UList<label>& addr = patchAddr[patchI];
         
         if(addr.size())
         {
diff --git a/utilities/meshToFPMA/Make/options b/utilities/meshToFPMA/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/meshToFPMA/Make/options
+++ b/utilities/meshToFPMA/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/patchesToSubsets/Make/options b/utilities/patchesToSubsets/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..3f326d676999019415a1647018f21f09b1d72b79 100644
--- a/utilities/patchesToSubsets/Make/options
+++ b/utilities/patchesToSubsets/Make/options
@@ -1,12 +1,18 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
+
 ifeq ($(WM_PROJECT), foam)
     VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
     ifeq ($(VER), 1)
diff --git a/utilities/preparePar/Make/options b/utilities/preparePar/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/preparePar/Make/options
+++ b/utilities/preparePar/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/scaleMesh/Make/options b/utilities/scaleMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/scaleMesh/Make/options
+++ b/utilities/scaleMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/scaleSurfaceMesh/Make/options b/utilities/scaleSurfaceMesh/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/scaleSurfaceMesh/Make/options
+++ b/utilities/scaleSurfaceMesh/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/subsetToPatch/Make/options b/utilities/subsetToPatch/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/subsetToPatch/Make/options
+++ b/utilities/subsetToPatch/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/surfaceFeatureEdges/Make/options b/utilities/surfaceFeatureEdges/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/surfaceFeatureEdges/Make/options
+++ b/utilities/surfaceFeatureEdges/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/surfaceGenerateBoundingBox/Make/options b/utilities/surfaceGenerateBoundingBox/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/surfaceGenerateBoundingBox/Make/options
+++ b/utilities/surfaceGenerateBoundingBox/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
diff --git a/utilities/surfaceToFMS/Make/options b/utilities/surfaceToFMS/Make/options
index 5d57ec4d50a4f29e77445c8b7597b7a43ee2387d..cea018a7d2dfecf7f484eef74a70713884565033 100644
--- a/utilities/surfaceToFMS/Make/options
+++ b/utilities/surfaceToFMS/Make/options
@@ -1,10 +1,15 @@
 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)