diff --git a/applications/test/parallelOverset/heatTransfer/0.orig/T b/applications/test/parallelOverset/heatTransfer/0.orig/T
index a60edc4bb6..c775c6f0c5 100644
--- a/applications/test/parallelOverset/heatTransfer/0.orig/T
+++ b/applications/test/parallelOverset/heatTransfer/0.orig/T
@@ -20,8 +20,7 @@ internalField   uniform 273;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/applications/test/parallelOverset/heatTransfer/0.orig/zoneID b/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
index 1a49886c28..3e3f18697d 100644
--- a/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
+++ b/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
@@ -21,8 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict b/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
index 9cf0a3e506..3d43ee3a28 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
index a60edc4bb6..c775c6f0c5 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
@@ -20,8 +20,7 @@ internalField   uniform 273;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
index 1a49886c28..3e3f18697d 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
@@ -21,8 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
index 05abdb1211..c2ae888d83 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
@@ -21,7 +21,7 @@ internalField   uniform 0.135;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
index 6632f3a00a..247a5108d5 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
@@ -22,7 +22,7 @@ internalField   uniform 2400;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
index 53677df701..fcfa580315 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
@@ -21,7 +21,7 @@ internalField   uniform 573;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
index 5cece76bbc..1009d2e5c0 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
@@ -21,7 +21,7 @@ internalField   uniform (4 0 0);
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
index cd6b58ed75..255a43dc3c 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
@@ -21,7 +21,7 @@ internalField   uniform 1;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
index 09f0b475a0..1f62304619 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
index fc2816f9c8..00c4a0c4b5 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
index 9cc8bf0958..5b56a29606 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
@@ -21,7 +21,7 @@ internalField   uniform 0.0834168596800118;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
index 61a91909ce..6fb5e9d02b 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
@@ -21,7 +21,7 @@ internalField   uniform 6;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
index 1a2cadee45..dd6a7578c9 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
index 5efc7dc9bc..987e2d93dd 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
@@ -21,7 +21,7 @@ internalField   uniform 10e5;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
index 5a6e17f79f..2beac86f85 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
index 255ac9e47e..840f788820 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 maxNonOrtho 55;
 
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
index 255ac9e47e..840f788820 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 maxNonOrtho 55;
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index d713f87d08..73ab09eedd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -20,7 +20,6 @@ internalField   uniform 265;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index ea88eb638e..8921aa58a9 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -20,7 +20,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index 2700375e28..2afacd9bcd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
index 6be2049d73..038283f682 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 0.01;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
index f16727920e..4a47dfb718 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
@@ -21,7 +21,6 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index 570b441ed4..481dd7a40f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index e95c098391..849e28cc0c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -20,7 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index 1784afbe76..1331225169 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -20,7 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     wall
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
index 34038d2a6a..d7076cc2a6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
@@ -21,7 +21,6 @@ internalField   uniform (0.1 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
index 264614aeef..477b6a84cb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
index ba6fb8079c..cc506b3d90 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 0.01;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
index 710b507569..97aa18db4f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
index b53cfca0b2..4b9c57b092 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
index bb5336eab0..cf77866f46 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
@@ -21,7 +21,6 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
index bc3cddeaaf..5d78afc925 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
@@ -21,7 +21,6 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     floor
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
index 58e5de004b..c14119ee33 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
@@ -22,8 +22,7 @@ internalField   uniform $flowVelocity;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
index e84ad141fd..6491f88651 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
@@ -22,8 +22,7 @@ internalField   uniform $turbulentEpsilon;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
index abe9409341..e264adb202 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
@@ -22,8 +22,7 @@ internalField   uniform $turbulentKE;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
index cc655b9cc5..9ec55e9f01 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
index e7f065b3bd..f5688d226d 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
@@ -22,8 +22,7 @@ internalField   uniform $pressure;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
index b1cdf0478e..88d3b0af1d 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
index b1fc09c125..4d9613a87a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
@@ -20,8 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     walls
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
index ca86c9f6e5..3fe3a7428c 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
@@ -21,8 +21,7 @@ internalField   uniform 200;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
index b74e3daf92..e3c6782ce0 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
@@ -20,8 +20,7 @@ internalField   uniform 0.2;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
index 11af85939e..55de8c57bc 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
index f7c72d5ce2..b68e974c96 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
index 55e4c8b692..ab7fd5c287 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
index acef7b1a3d..84f0d963f3 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     ".*"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
index 45c9f5a085..3d7fddaaaa 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
@@ -20,8 +20,7 @@ internalField   uniform (0.1 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     walls
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
index 29afa2eaee..363e7193fd 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     "(walls|hole)"
     {
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
index b1cdf0478e..88d3b0af1d 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     overset
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
index 39534ce7d6..7287ee4672 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
@@ -22,8 +22,7 @@ internalField   uniform $flowVelocity;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     walls
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
index 73ef242b33..77057e92f9 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
@@ -22,8 +22,7 @@ internalField   uniform $turbulentEpsilon;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
index 6f9c85a404..0b620e5037 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
@@ -22,8 +22,7 @@ internalField   uniform $turbulentKE;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
index 2787701e9b..e0dfb26bdc 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     ".*"
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
index e6cf3ba42d..bc19e50647 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
index 6d5097ae58..881e6b57d5 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
@@ -22,8 +22,7 @@ internalField   uniform $turbulentOmega;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
index c5b82e301c..13a2839329 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
@@ -22,8 +22,7 @@ internalField   uniform $pressure;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
index 03c62b5385..6d67451920 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     ".*"
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
index 95b5c01145..30927cd43f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
@@ -21,7 +21,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
index 8c1412a72c..35a2c286f5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
@@ -21,7 +21,7 @@ internalField   uniform 1.8e-3;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
index 669c31de88..56b281e3c5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
@@ -21,7 +21,7 @@ internalField   uniform 3.75e-3;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
index d77a028c99..a5e5bfa820 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
index b3625fad3e..25a0b0624e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
@@ -21,7 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
     {
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U
index 0d29163301..8012688baa 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U
@@ -21,7 +21,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon
index 64b9a670e2..2d7b8573c1 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 0.0495;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k
index 25221fb661..cc23a16840 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.06;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut
index 110198aa57..37c82e5a61 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p
index f783a48506..5e26679f1c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
index 6d9b2d3752..1bc73bb133 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
@@ -20,7 +20,6 @@ internalField   uniform (1 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
index 77fa018868..5871a0a968 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
@@ -20,7 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/U b/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
index c1545dff3a..ff1bc9a5b0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
@@ -23,7 +23,6 @@ internalField   uniform $flowVelocity;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     #include "include/fixedInlet"
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/k b/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
index 8c4d2cda5e..0f4ece8bfe 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
@@ -22,7 +22,6 @@ internalField   uniform $turbulentKE;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     //- Define inlet conditions
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut b/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
index 3ef2c30077..cff1c42399 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     frontAndBack
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega b/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
index 138c3d5856..3381e6db75 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
@@ -22,7 +22,6 @@ internalField   uniform $turbulentOmega;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     #include "include/fixedInlet"
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/p b/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
index 8aa9f4a383..dee14af37e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
@@ -22,7 +22,6 @@ internalField   uniform $pressure;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
index ae51a4e212..195bd9349d 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
@@ -20,7 +20,6 @@ internalField   uniform (1 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
index d8e7efa4e0..dbfb08b29e 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
index d68593adba..065e2f9495 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
index c84162232e..eb397a2944 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
@@ -20,7 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
index cc4c0dc2c9..15e4d2097f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
index 58f163c298..aa43c66beb 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
@@ -20,7 +20,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/mesh/parallel/filter/0.orig/nut b/tutorials/mesh/parallel/filter/0.orig/nut
index e562e87db2..ffb2aef86c 100644
--- a/tutorials/mesh/parallel/filter/0.orig/nut
+++ b/tutorials/mesh/parallel/filter/0.orig/nut
@@ -21,8 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     walls
     {
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U
index 34f09097ae..18ca986c6b 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U
@@ -21,8 +21,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     minX
     {
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p
index 35634c70ac..2437133816 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     minX
     {
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
index 9cf0a3e506..3d43ee3a28 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
index 9cf0a3e506..3d43ee3a28 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U
index 30aa9787a5..1dd656a299 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U
@@ -24,7 +24,6 @@ internalField   uniform ($mUmean 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water
index 3856c8385f..18369f4ae2 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k
index f25a1bf5f9..2ef9b521fa 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut
index 41e5393439..eea1f37abd 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 5e-07;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega
index de99b42078..3ccbcaa689 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega
@@ -21,7 +21,6 @@ internalField   uniform 2;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh
index 90dc33ec39..72840de3dc 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement
index a7717c4746..1670e786f9 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement
@@ -21,7 +21,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/U
index 9e18534aa1..4593f2724a 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/U
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/U
@@ -21,8 +21,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/alpha.water
index d0ecf37761..ceae14be37 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/alpha.water
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/k
index 7739e407e8..eff50eb43a 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/k
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/k
@@ -21,8 +21,7 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/nut
index 5973a4c7de..508970803f 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/nut
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/nut
@@ -21,8 +21,7 @@ internalField   uniform 5e-07;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     upperWall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/omega b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/omega
index f4d2cc0538..7223ea0a74 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/omega
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/omega
@@ -21,8 +21,7 @@ internalField   uniform 2;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     upperWall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
index 856b531811..a34cf5d7e9 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/0.orig/p_rgh
@@ -20,8 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"
 
     wall
     {
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/meshQualityDict b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/meshQualityDict
index 320ee800c8..34ae1d089a 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/meshQualityDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/meshQualityDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Include defaults parameters from master dictionary
-#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+#includeEtc "caseDicts/meshQualityDict"
 
 ////- minFaceWeight (0 -> 0.5)
 //minFaceWeight 0.02;
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
index 9ff2bd552e..b35b7f41b6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
@@ -24,7 +24,6 @@ internalField   uniform ($mUmean 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
index 3856c8385f..18369f4ae2 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
index f25a1bf5f9..2ef9b521fa 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
index 41e5393439..eea1f37abd 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 5e-07;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
index de99b42078..3ccbcaa689 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
@@ -21,7 +21,6 @@ internalField   uniform 2;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
index 90dc33ec39..72840de3dc 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
index a7717c4746..1670e786f9 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
@@ -21,7 +21,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
index 2e33679f06..6594629df9 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
@@ -21,7 +21,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
index 5294bd1018..2c8ff9d885 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
@@ -21,7 +21,6 @@ internalField   uniform 1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
index 64b9a670e2..2d7b8573c1 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 0.0495;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
index 25221fb661..cc23a16840 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.06;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
index 110198aa57..37c82e5a61 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
index 87c53f4af9..914ecebee5 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
@@ -21,7 +21,6 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     inlet
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
index a63b70f9b0..233a2d97a8 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
@@ -21,7 +21,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
index 672fe184ce..d3dce4b5b8 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
index 55bbd29c2f..c508a2cbeb 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
@@ -21,7 +21,6 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
index b1a2019085..c44bfba970 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
@@ -21,7 +21,6 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
index 282297cbd8..1df397362f 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
index d23a59c0e1..961a15f6d1 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
@@ -20,7 +20,6 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
index 384338071d..498248e41c 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
@@ -21,7 +21,6 @@ internalField   uniform 0;
 
 boundaryField
 {
-    //- Set patchGroups for constraint patches
     #includeEtc "caseDicts/setConstraintTypes"
 
     stationaryWalls