diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options
index f0483b99be..256fa40164 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/options
@@ -13,6 +13,7 @@ EXE_INC = \
     ${CGAL_EXACT} \
     ${CGAL_INEXACT} \
     ${CGAL_INC} \
+    ${c++CGALWARN} \
     -IconformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
index 8cfdbd04fd..ac0dfdc4f8 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
     ${CGAL_EXACT} \
     ${CGAL_INEXACT} \
     ${CGAL_INC} \
+    ${c++CGALWARN} \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 7a2476df3e..df2c8c2f65 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -2231,7 +2231,6 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                     if
                     (
                         vA->boundaryPoint() && vB->boundaryPoint()
-                     && !isProcBoundaryEdge(eit)
                      && !ptPairs_.isPointPair(vA, vB)
                      && !ftPtConformer_.featurePointPairs().isPointPair(vA, vB)
                     )
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index f0c4c7d746..f142470106 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -1160,23 +1160,6 @@ void Foam::conformalVoronoiMesh::insertFeaturePoints(bool distribute)
     Info<< nl
         << "Inserting feature points" << endl;
 
-
-//    Map<label> oldToNewIndices = insertPoints(featureVertices_, distribute);
-
-//    featurePtPairs_.reIndex(oldToNewIndices);
-
-//    forAll(featureVertices_, vI)
-//    {
-//        Map<label>::const_iterator iter =
-//            oldToNewIndices.find(featureVertices_[vI].index());
-
-//        if (iter != oldToNewIndices.end())
-//        {
-//            featureVertices_[vI].index() = iter();
-//        }
-//    }
-
-
     const label preFeaturePointSize(number_of_vertices());
 
     if (Pstream::parRun() && distribute)
@@ -1187,7 +1170,10 @@ void Foam::conformalVoronoiMesh::insertFeaturePoints(bool distribute)
     const List<Vb>& ftPtVertices = ftPtConformer_.featurePointVertices();
 
     // Insert the created points directly as already distributed.
-    this->DelaunayMesh<Delaunay>::insertPoints(ftPtVertices, true);
+    Map<label> oldToNewIndices =
+        this->DelaunayMesh<Delaunay>::insertPoints(ftPtVertices, true);
+
+    ftPtConformer_.reIndexPointPairs(oldToNewIndices);
 
     label nFeatureVertices = number_of_vertices() - preFeaturePointSize;
     reduce(nFeatureVertices, sumOp<label>());
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 6501d72758..fa42d63e17 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -609,4 +609,26 @@ void Foam::featurePointConformer::distribute
 }
 
 
+void Foam::featurePointConformer::reIndexPointPairs
+(
+    const Map<label>& oldToNewIndices
+)
+{
+    forAll(featurePointVertices_, vI)
+    {
+        const label currentIndex = featurePointVertices_[vI].index();
+
+        Map<label>::const_iterator newIndexIter =
+            oldToNewIndices.find(currentIndex);
+
+        if (newIndexIter != oldToNewIndices.end())
+        {
+            featurePointVertices_[vI].index() = newIndexIter();
+        }
+    }
+
+    ftPtPairs_.reIndex(oldToNewIndices);
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
index ddda0959e8..e3c415b7fa 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
@@ -176,6 +176,9 @@ public:
             //- Distribute the feature point vertices according to the
             //  supplied background mesh
             void distribute(const backgroundMeshDecomposition& decomposition);
+
+            //- Reindex the feature point pairs using the map.
+            void reIndexPointPairs(const Map<label>& oldToNewIndices);
 };
 
 
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
index 62aec78cdb..7c52fa131a 100755
--- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
+    ${c++CGALWARN} \
     -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
     -I../cvMesh/vectorTools \
     -IconformalVoronoi2DMesh/lnInclude \
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/files b/applications/utilities/mesh/manipulation/orientFaceZone/Make/files
index 07214af76c..f5a0821f85 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/files
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/files
@@ -1,4 +1,3 @@
-patchFaceOrientation.C
 orientFaceZone.C
 
 EXE = $(FOAM_APPBIN)/orientFaceZone
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
index 9f08e8d2a8..30fde688e5 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
+    -lautoMesh \
     -ltriSurface
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index 55e032fcd4..3557ffc49b 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -52,10 +52,14 @@ inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap, const bool reUse)
         ptr_ = ap.ptr_;
         ap.ptr_ = 0;
     }
-    else
+    else if (ap.valid())
     {
         ptr_ = ap().clone().ptr();
     }
+    else
+    {
+        ptr_ = NULL;
+    }
 }
 
 
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index abbcf4664b..4fc3ed6029 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -12,4 +12,22 @@ fi
 
 wmake $makeType pairPatchAgglomeration
 
+
+## get SCOTCH_VERSION, SCOTCH_ARCH_PATH
+#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
+#then
+#    . $settings
+#    echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
+#else
+#    echo
+#    echo "Error: no config/scotch.sh settings"
+#    echo
+#fi
+#
+#if [ -n "$SCOTCH_ARCH_PATH" ]
+#then
+#    wmake $makeType scotchGamgAgglomeration
+#fi
+
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
index d5bfe6f751..dd0bfd0391 100644
--- a/src/mesh/autoMesh/Make/files
+++ b/src/mesh/autoMesh/Make/files
@@ -17,6 +17,8 @@ $(autoHexMesh)/meshRefinement/meshRefinement.C
 $(autoHexMesh)/meshRefinement/meshRefinementMerge.C
 $(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
 $(autoHexMesh)/meshRefinement/meshRefinementRefine.C
+$(autoHexMesh)/meshRefinement/patchFaceOrientation.C
+
 $(autoHexMesh)/refinementFeatures/refinementFeatures.C
 $(autoHexMesh)/refinementSurfaces/surfaceZonesInfo.C
 $(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index 0e2fcd07ce..f9676fcbe6 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -112,8 +112,6 @@ const
 
         if (localCellI != -1)
         {
-            Pout<< "Found point " << keepPoint << " in cell " << localCellI
-                << " on processor " << Pstream::myProcNo() << endl;
             globalCellI = globalCells.toGlobal(localCellI);
         }
 
@@ -130,6 +128,14 @@ const
                 << exit(FatalError);
         }
 
+
+        label procI = globalCells.whichProcID(globalCellI);
+        label procCellI = globalCells.toLocal(procI, globalCellI);
+
+        Info<< "Found point " << keepPoint << " in cell " << procCellI
+            << " on processor " << procI << endl;
+
+
         if (globalCells.isLocal(globalCellI))
         {
             cellLabels[i] = localCellI;
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index f7815a16d8..2583c2ddfe 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -379,6 +379,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
 
 Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 (
+    const bool doGlobalRegions,
     const boolList& blockedFace,
     const List<labelPair>& explicitConnections,
 
@@ -395,7 +396,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
         cellRegion
     );
 
-    if (!Pstream::parRun())
+    if (!doGlobalRegions)
     {
         return autoPtr<globalIndex>(new globalIndex(nLocalRegions));
     }
@@ -422,7 +423,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
     // (this will create gaps in the global region list so they will get
     // merged later on)
 
-    while (Pstream::parRun())
+    while (true)
     {
         if (debug)
         {
@@ -690,13 +691,14 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::regionSplit::regionSplit(const polyMesh& mesh)
+Foam::regionSplit::regionSplit(const polyMesh& mesh, const bool doGlobalRegions)
 :
     MeshObject<polyMesh, Foam::TopologicalMeshObject, regionSplit>(mesh),
     labelList(mesh.nCells(), -1)
 {
     globalNumberingPtr_ = calcRegionSplit
     (
+        doGlobalRegions,    //do global regions
         boolList(0, false), //blockedFaces
         List<labelPair>(0), //explicitConnections,
         *this
@@ -707,7 +709,8 @@ Foam::regionSplit::regionSplit(const polyMesh& mesh)
 Foam::regionSplit::regionSplit
 (
     const polyMesh& mesh,
-    const boolList& blockedFace
+    const boolList& blockedFace,
+    const bool doGlobalRegions
 )
 :
     MeshObject<polyMesh, Foam::TopologicalMeshObject, regionSplit>(mesh),
@@ -715,6 +718,7 @@ Foam::regionSplit::regionSplit
 {
     globalNumberingPtr_ = calcRegionSplit
     (
+        doGlobalRegions,
         blockedFace,        //blockedFaces
         List<labelPair>(0), //explicitConnections,
         *this
@@ -726,7 +730,8 @@ Foam::regionSplit::regionSplit
 (
     const polyMesh& mesh,
     const boolList& blockedFace,
-    const List<labelPair>& explicitConnections
+    const List<labelPair>& explicitConnections,
+    const bool doGlobalRegions
 )
 :
     MeshObject<polyMesh, Foam::TopologicalMeshObject, regionSplit>(mesh),
@@ -734,6 +739,7 @@ Foam::regionSplit::regionSplit
 {
     globalNumberingPtr_ = calcRegionSplit
     (
+        doGlobalRegions,
         blockedFace,            //blockedFaces
         explicitConnections,    //explicitConnections,
         *this
diff --git a/src/meshTools/regionSplit/regionSplit.H b/src/meshTools/regionSplit/regionSplit.H
index b7be9dd32e..83302529df 100644
--- a/src/meshTools/regionSplit/regionSplit.H
+++ b/src/meshTools/regionSplit/regionSplit.H
@@ -87,6 +87,9 @@ Description
       proc0 | proc1 | proc2
 
 
+    Can optionally keep all regions local to the processor.
+
+
 SourceFiles
     regionSplit.C
 
@@ -155,6 +158,7 @@ class regionSplit
         //- Calculate global region split. Return globalIndex.
         autoPtr<globalIndex> calcRegionSplit
         (
+            const bool doGlobalRegions,
             const boolList& blockedFace,
             const List<labelPair>& explicitConnections,
             labelList& cellRegion
@@ -170,11 +174,20 @@ public:
     // Constructors
 
         //- Construct from mesh
-        regionSplit(const polyMesh&);
+        regionSplit
+        (
+            const polyMesh&,
+            const bool doGlobalRegions = Pstream::parRun()
+        );
 
         //- Construct from mesh and whether face is blocked
         //  NOTE: blockedFace has to be consistent across coupled faces!
-        regionSplit(const polyMesh&, const boolList& blockedFace);
+        regionSplit
+        (
+            const polyMesh&,
+            const boolList& blockedFace,
+            const bool doGlobalRegions = Pstream::parRun()
+        );
 
         //- Construct from mesh and whether face is blocked. Additional explicit
         //  connections between normal boundary faces.
@@ -183,7 +196,8 @@ public:
         (
             const polyMesh&,
             const boolList& blockedFace,
-            const List<labelPair>&
+            const List<labelPair>&,
+            const bool doGlobalRegions = Pstream::parRun()
         );
 
 
@@ -195,6 +209,12 @@ public:
             return globalNumberingPtr_();
         }
 
+        //- Return local number of regions
+        label nLocalRegions() const
+        {
+            return globalNumbering().localSize(Pstream::myProcNo());
+        }
+
         //- Return total number of regions
         label nRegions() const
         {
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 252bcdfbdc..0ede58107c 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -968,10 +968,10 @@ Foam::surfaceIntersection::surfaceIntersection
 
             if (!usedPoints.found(pointI))
             {
-                FatalErrorIn("surfaceIntersection::surfaceIntersection")
+                WarningIn("surfaceIntersection::surfaceIntersection")
                     << "Problem: cut point:" << pointI
                     << " coord:" << cutPoints_[pointI]
-                    << " not used by any edge" << abort(FatalError);
+                    << " not used by any edge" << endl;
             }
         }
     }
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 8021284723..4e19610373 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -167,7 +167,7 @@ void Foam::decompositionMethod::calcCellCells
 (
     const polyMesh& mesh,
     const labelList& agglom,
-    const label nCoarse,
+    const label nLocalCoarse,
     const bool parallel,
     CompactListList<label>& cellCells
 )
@@ -182,7 +182,7 @@ void Foam::decompositionMethod::calcCellCells
 
     globalIndex globalAgglom
     (
-        nCoarse,
+        nLocalCoarse,
         Pstream::msgType(),
         Pstream::worldComm,
         parallel
@@ -224,7 +224,7 @@ void Foam::decompositionMethod::calcCellCells
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Number of faces per coarse cell
-    labelList nFacesPerCell(nCoarse, 0);
+    labelList nFacesPerCell(nLocalCoarse, 0);
 
     for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
     {
@@ -374,7 +374,7 @@ void Foam::decompositionMethod::calcCellCells
 //    const boolList& blockedFace,
 //    const List<labelPair>& explicitConnections,
 //    const labelList& agglom,
-//    const label nCoarse,
+//    const label nLocalCoarse,
 //    const bool parallel,
 //    CompactListList<label>& cellCells
 //)
@@ -389,7 +389,7 @@ void Foam::decompositionMethod::calcCellCells
 //
 //    globalIndex globalAgglom
 //    (
-//        nCoarse,
+//        nLocalCoarse,
 //        Pstream::msgType(),
 //        Pstream::worldComm,
 //        parallel
@@ -431,7 +431,7 @@ void Foam::decompositionMethod::calcCellCells
 //    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 //    // Number of faces per coarse cell
-//    labelList nFacesPerCell(nCoarse, 0);
+//    labelList nFacesPerCell(nLocalCoarse, 0);
 //
 //    // 1. Internal faces
 //    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
@@ -764,6 +764,24 @@ Foam::labelList Foam::decompositionMethod::decompose
     // Any weights specified?
     label nWeights = returnReduce(cellWeights.size(), sumOp<label>());
 
+    if (nWeights > 0 && cellWeights.size() != mesh.nCells())
+    {
+        FatalErrorIn
+        (
+            "decompositionMethod::decompose\n"
+            "(\n"
+            "   const polyMesh&,\n"
+            "   const scalarField&,\n"
+            "   const boolList&,\n"
+            "   const PtrList<labelList>&,\n"
+            "   const labelList&,\n"
+            "   const List<labelPair>&\n"
+        )   << "Number of weights " << cellWeights.size()
+            << " differs from number of cells " << mesh.nCells()
+            << exit(FatalError);
+    }
+
+
     // Any processor sets?
     label nProcSets = 0;
     forAll(specifiedProcessorFaces, setI)
@@ -828,10 +846,18 @@ Foam::labelList Foam::decompositionMethod::decompose
                 << nProcSets << endl << endl;
         }
 
-        // Determine global regions, separated by blockedFaces
-        regionSplit globalRegion(mesh, blockedFace, explicitConnections);
+        // Determine local regions, separated by blockedFaces
+        regionSplit localRegion(mesh, blockedFace, explicitConnections, false);
 
 
+        if (debug)
+        {
+            Info<< "Constrained decomposition:" << endl
+                << "    split into " << localRegion.nLocalRegions()
+                << " regions."
+                << endl;
+        }
+
         // Determine region cell centres
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -840,11 +866,11 @@ Foam::labelList Foam::decompositionMethod::decompose
         // somewhere in the middle of the domain which might not be anywhere
         // near any of the cells.
 
-        pointField regionCentres(globalRegion.nRegions(), point::max);
+        pointField regionCentres(localRegion.nLocalRegions(), point::max);
 
-        forAll(globalRegion, cellI)
+        forAll(localRegion, cellI)
         {
-            label regionI = globalRegion[cellI];
+            label regionI = localRegion[cellI];
 
             if (regionCentres[regionI] == point::max)
             {
@@ -855,22 +881,22 @@ Foam::labelList Foam::decompositionMethod::decompose
         // Do decomposition on agglomeration
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        scalarField regionWeights(globalRegion.nRegions(), 0);
+        scalarField regionWeights(localRegion.nLocalRegions(), 0);
 
         if (nWeights > 0)
         {
-            forAll(globalRegion, cellI)
+            forAll(localRegion, cellI)
             {
-                label regionI = globalRegion[cellI];
+                label regionI = localRegion[cellI];
 
                 regionWeights[regionI] += cellWeights[cellI];
             }
         }
         else
         {
-            forAll(globalRegion, cellI)
+            forAll(localRegion, cellI)
             {
-                label regionI = globalRegion[cellI];
+                label regionI = localRegion[cellI];
 
                 regionWeights[regionI] += 1.0;
             }
@@ -879,7 +905,7 @@ Foam::labelList Foam::decompositionMethod::decompose
         finalDecomp = decompose
         (
             mesh,
-            globalRegion,
+            localRegion,
             regionCentres,
             regionWeights
         );
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index 36bb6ab7a8..2d02936d2b 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -219,7 +219,7 @@ public:
         // Other
 
             //- Helper: determine (local or global) cellCells from mesh
-            //  agglomeration.
+            //  agglomeration. Agglomeration is local to the processor.
             //  local  : connections are in local indices. Coupled across
             //           cyclics but not processor patches.
             //  global : connections are in global indices. Coupled across
@@ -228,34 +228,11 @@ public:
             (
                 const polyMesh& mesh,
                 const labelList& agglom,
-                const label nCoarse,
+                const label nLocalCoarse,
                 const bool global,
                 CompactListList<label>& cellCells
             );
 
-            //- Helper: determine (local or global) cellCells from mesh
-            //  agglomeration and additional specification:
-            //  - any additional connections between non-coupled internal
-            //    or boundary faces.
-            //  - any internal or coupled faces (or additional connections)
-            //    are blocked
-            //
-            //  local  : connections are in local indices. Coupled across
-            //           cyclics but not processor patches.
-            //  global : connections are in global indices. Coupled across
-            //            cyclics and processor patches.
-            //static void calcCellCells
-            //(
-            //    const polyMesh& mesh,
-            //    const boolList& blockedFace,
-            //    const List<labelPair>& explicitConnections,
-            //    const labelList& agglom,
-            //    const label nCoarse,
-            //    const bool global,
-            //    CompactListList<label>& cellCells
-            //);
-
-
             //- Helper: extract constraints:
             //  blockedface: existing faces where owner and neighbour on same
             //               proc
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index abcd8419bd..3ef4e5b75e 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -8,7 +8,13 @@ cd ${0%/*} || exit 1    # run from this directory
 cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
+
 runApplication collapseEdges -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
 
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 3113b19787..1674277920 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -14,7 +14,13 @@ runApplication blockMesh -region backgroundMeshDecomposition
 runApplication decomposePar -region backgroundMeshDecomposition
 
 runParallel foamyHexMesh $nProc
+
 runParallel collapseEdges $nProc -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
 runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
 
 runApplication reconstructParMesh -latestTime
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
index fe467dd3c6..959eae6fd3 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun
@@ -8,7 +8,13 @@ cd ${0%/*} || exit 1    # run from this directory
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication foamyHexMesh
+
 runApplication collapseEdges -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
 
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index 237296826d..8f33af0d7e 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -15,7 +15,13 @@ runApplication blockMesh -region backgroundMeshDecomposition
 runApplication decomposePar -region backgroundMeshDecomposition
 
 runParallel foamyHexMesh $nProc
+
 runParallel collapseEdges $nProc -latestTime -collapseFaces
+mv log.collapseEdges log.collapseFaces
+
+runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
+mv log.collapseEdges log.collapseFaceSet
+
 runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
 
 runApplication reconstructParMesh -latestTime
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
index 3e9b928240..94024b2b8c 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
@@ -15,6 +15,8 @@ rm -r snapToSurface?.obj tetsToSnapTo.obj > /dev/null 2>&1
 
 rm domain coneAndSphere > /dev/null 2>&1
 
+rm -rf 0/
+
 cleanCase
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
index bfc610ad80..497c84f91f 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
@@ -22,5 +22,7 @@ runApplication surfaceBooleanFeatures intersection \
 
 runApplication foamyHexMesh
 
+runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
+
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 167a420ab6..ce87bd65a7 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,5 +1,4 @@
 CGAL_INC = \
-    -Wno-old-style-cast \
     -I$(CGAL_ARCH_PATH)/include \
     -I$(MPFR_ARCH_PATH)/include \
     -I$(GMP_ARCH_PATH)/include \
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 1f78395afb..1a0343b5cf 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -3,6 +3,10 @@
 # -Woverloaded-virtual may produce spurious warnings, disable for now
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison
 
+
+# Suppress CGAL warnings
+c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
+
 CC          = clang++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index 7ae53634e5..49849377a6 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -3,6 +3,10 @@
 # -Woverloaded-virtual may produce spurious warnings, disable for now
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison
 
+
+# Suppress CGAL warnings
+c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
+
 CC          = clang++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)