diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index c3bde490f4d74301cae4007beaf31fddb7df6600..7fa619881e94d4642e3026472bf31bb9119fb742 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
end
#- ParaView version, automatically determine major version:
-setenv ParaView_VERSION 3.10.1
+setenv ParaView_VERSION 3.12.0
setenv ParaView_MAJOR detect
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index 754f9fade641f1c2e9cbc3f6b79bb16eb6a27723..a432e62c54a168c2189991d5427a5977f813205f 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -51,7 +51,7 @@ done
#- ParaView version, automatically determine major version
-export ParaView_VERSION=3.10.1
+export ParaView_VERSION=3.12.0
export ParaView_MAJOR=detect
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 026f614b53623028cfabc159623d6e6392fa55f4..b1c10493e9bd476719f1815f10770acb06c8c5c1 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -9,20 +9,18 @@ application=`getApplication`
runApplication blockMesh
-runApplication setSet -batch cRefine.setSet
+runApplication topoSet -dict cRefine.topoSetDict
runApplication refineMesh -overwrite -dict
-rm log.setSet
-runApplication setSet -batch f.setSet
-rm log.setSet
-runApplication setSet -batch fZone.setSet
+rm log.topoSet
+runApplication topoSet -dict f.topoSetDict
# create the pyrolysis region.
runApplication extrudeToRegionMesh -overwrite
-rm log.setSet
-runApplication setSet -batch fBurner.setSet
+rm log.topoSet
+runApplication topoSet -dict fBurner.topoSetDict
runApplication createPatch -overwrite
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet
deleted file mode 100644
index 526bfc6a738fad8a5de7c18642399a386a799a8e..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet
+++ /dev/null
@@ -1 +0,0 @@
-cellSet refineCells new boxToCell (-0.15 0.0 -0.3)(0.15 2.4 0.3)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..e5f361be93c74835fa2c10af853af7fc6f59dd57
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name refineCells;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceInfo
+ {
+ box (-0.15 0.0 -0.3)(0.15 2.4 0.3);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet
deleted file mode 100644
index 10dfed3e4a81368889da1d0cdabd8a853f0f0792..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet
+++ /dev/null
@@ -1,2 +0,0 @@
-faceSet fLeft new boxToFace (-0.151 0 -0.3)(-0.14999 2.4 0.3)
-faceSet fRight new boxToFace (0.14999 0 -0.3)(0.151 2.4 0.3)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..fe77b152d8607f13078070539b1b82594f3a0e78
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name fLeft;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.151 0 -0.3)(-0.14999 2.4 0.3);
+ }
+ }
+ {
+ name fRight;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (0.14999 0 -0.3)(0.151 2.4 0.3);
+ }
+ }
+
+ {
+ name fRight_zone;
+ type faceZoneSet;
+ action new;
+ source setToFaceZone;
+ sourceInfo
+ {
+ faceSet fRight;
+ }
+ }
+
+ {
+ name fLeft_zone;
+ type faceZoneSet;
+ action new;
+ source setToFaceZone;
+ sourceInfo
+ {
+ faceSet fLeft;
+ }
+ }
+
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet
deleted file mode 100644
index eebf5d28b30c20bb406310053bfdc907ef7a09de..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet fBurner new boxToFace (-0.15 -0.001 -0.30) (0.15 0.001 0.30)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..ef751dd06f1fadadd66a40e89574acab4362fb49
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name fBurner;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet
deleted file mode 100644
index 75644274d55e4b78b9edc3e064e75b2fa450c226..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet
+++ /dev/null
@@ -1,2 +0,0 @@
-faceZoneSet fRight_zone new setToFaceZone fRight
-faceZoneSet fLeft_zone new setToFaceZone fLeft
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
index 23c0a4ac9a63d8cad92dde1f36cb860b34b9e043..70560dade2c80f61767e636c76b149930ad00c88 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
-runApplication setSet -batch makeFaceSet.setSet
+runApplication topoSet
runApplication createPatch -overwrite
# Run
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet b/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet
deleted file mode 100644
index 78681a7505850cc0519ce586eb04590d655ab63e..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet f0 new boxToFace (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..0b8b1e0dc482d988da3faaf4fad7b7065ed3a2d7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name f0;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
index 1bfc0610535fb31580528d1a85c3403c2a553b88..ebd159495f7dd55b54401290eabbba8957776e40 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -7,7 +7,7 @@
application=`getApplication`
runApplication blockMesh
-runApplication setSet -batch makeFaceSet.setSet
+runApplication topoSet
runApplication createPatch -overwrite
runApplication decomposePar -force
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet b/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
deleted file mode 100644
index cf52389ea3909843100bffd5d9d94d3c9657f017..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet f0 new boxToFace (-0.1 -0.001 -0.1)(0.1 0.005 0.1)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..6e4e4d02c08c9321dcdd97c8055f974d1b34c680
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name f0;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
+ }
+ }
+);
+
+// ************************************************************************* //