diff --git a/META-INFO/api-info b/META-INFO/api-info
index 486ee5c72c57eded266a2be96d496a2dc63e9028..7f0b5c3211dbc9d4ba7b2c77d0eda977996e69ca 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
 api=2006
-patch=200924
+patch=201012
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H
index 92755ce449a615faa120ad4f914e80cbd787e01e..2147775439286c3e2ab657f34925c801fd754a7d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H
@@ -67,10 +67,10 @@ if (doLagrangian)
             }
         }
 
-        forAllConstIters(theseCloudFields, fieldIter)
+        // Field order may differ on individual processors, so sort by name
+        for (const word& fieldName : theseCloudFields.sortedToc())
         {
-            const word& fieldName = fieldIter.key();
-            const word& fieldType = fieldIter.val();
+            const word& fieldType = theseCloudFields[fieldName];
 
             IOobject fieldObject
             (
diff --git a/modules/OpenQBMM b/modules/OpenQBMM
index 70d327b25ed66e4a7bead8c046bda4f87225415d..cee0fdd438c3e90403e90abfb23ef6ead3ab171d 160000
--- a/modules/OpenQBMM
+++ b/modules/OpenQBMM
@@ -1 +1 @@
-Subproject commit 70d327b25ed66e4a7bead8c046bda4f87225415d
+Subproject commit cee0fdd438c3e90403e90abfb23ef6ead3ab171d
diff --git a/modules/external-solver b/modules/external-solver
index 302f2518284be5a3c796091357a67fb1ae0250cd..f3dd3aac02feac29ccb62fbb147c757b896ea3db 160000
--- a/modules/external-solver
+++ b/modules/external-solver
@@ -1 +1 @@
-Subproject commit 302f2518284be5a3c796091357a67fb1ae0250cd
+Subproject commit f3dd3aac02feac29ccb62fbb147c757b896ea3db
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
index 3c1c6b92ae5a1a7190017d09698ab61c54329368..0bae7021c7e72f61c16d880fcadcba56811eaa54 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -86,7 +86,7 @@ Foam::mapPolyMesh::mapPolyMesh(const polyMesh& mesh)
 
     forAll(faceZoneFaceMap_, zonei)
     {
-        pointZoneMap_[zonei] = identity(mesh.faceZones()[zonei].size());
+        faceZoneFaceMap_[zonei] = identity(mesh.faceZones()[zonei].size());
     }
 
     forAll(cellZoneMap_, zonei)
diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch
index ca00bba6fc2c562e32d2bb7554829c980090fb29..fb7182a0dd8d025ce3f8d505c3a59bcef465c52b 100644
--- a/wmake/scripts/have_scotch
+++ b/wmake/scripts/have_scotch
@@ -90,6 +90,7 @@ search_scotch()
     then
         header=$(findFirstFile \
             "$prefix/include/$localDir/$incName" \
+            "$prefix/include/scotch/$incName" \
             "$prefix/include/$incName" \
         )
         library=$(findExtLib "$libName")
@@ -201,12 +202,15 @@ search_ptscotch()
         header=$(findFirstFile  \
             "$prefix/include/$FOAM_MPI/$incName" \
             "$prefix/include/$localDir/$incName" \
+            "$prefix/include/ptscotch/$incName" \
+            "$prefix/include/scotch/$incName" \
             "$prefix/include/$incName"
         )
         library="$(findExtLib $FOAM_MPI/$libName $libName)"
     elif isSystem "$prefix"
     then
         header=$(findFirstFile \
+            "/usr/local/include/$localDir/$incName" \
             "/usr/local/include/ptscotch/$incName" \
             "/usr/local/include/scotch/$incName" \
             "/usr/local/include/$incName" \