diff --git a/etc/templates/closedVolume/system/surfaceFeaturesDict b/etc/templates/closedVolume/system/surfaceFeaturesDict
new file mode 100644
index 000000000..415f47e68
--- /dev/null
+++ b/etc/templates/closedVolume/system/surfaceFeaturesDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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      surfaceFeaturesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaces
+(
+    "CAD.obj"
+);
+
+includedAngle   150;
+
+subsetFeatures
+{
+    nonManifoldEdges yes;
+    openEdges        yes;
+}
+
+trimFeatures
+{
+    minElem         0;
+    minLen          0;
+}
+
+writeObj        yes;
+
+// ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/README b/etc/templates/closedVolumeRotating/README
index 79c0fbf85..72086ca5e 100644
--- a/etc/templates/closedVolumeRotating/README
+++ b/etc/templates/closedVolumeRotating/README
@@ -29,7 +29,7 @@ Background Mesh
 
 Features
 ========
-+ Run surfaceFeatureExtract to extract features for explicit feature capturing
++ Run surfaceFeatures to extract features for explicit feature capturing
 
 Castellated Mesh
 ================
diff --git a/etc/templates/closedVolumeRotating/system/surfaceFeaturesDict b/etc/templates/closedVolumeRotating/system/surfaceFeaturesDict
new file mode 100644
index 000000000..8447795da
--- /dev/null
+++ b/etc/templates/closedVolumeRotating/system/surfaceFeaturesDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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      surfaceFeaturesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaces
+(
+    "fixed.obj"
+    "rotating.obj"
+    "rotatingZone.obj"
+);
+
+includedAngle   150;
+
+subsetFeatures
+{
+    nonManifoldEdges yes;
+    openEdges        yes;
+}
+
+trimFeatures
+{
+    minElem         0;
+    minLen          0;
+}
+
+writeObj        yes;
+
+// ************************************************************************* //
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeaturesDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeaturesDict
new file mode 100644
index 000000000..415f47e68
--- /dev/null
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeaturesDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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      surfaceFeaturesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaces
+(
+    "CAD.obj"
+);
+
+includedAngle   150;
+
+subsetFeatures
+{
+    nonManifoldEdges yes;
+    openEdges        yes;
+}
+
+trimFeatures
+{
+    minElem         0;
+    minLen          0;
+}
+
+writeObj        yes;
+
+// ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/system/surfaceFeaturesDict b/etc/templates/inflowOutflow/system/surfaceFeaturesDict
new file mode 100644
index 000000000..415f47e68
--- /dev/null
+++ b/etc/templates/inflowOutflow/system/surfaceFeaturesDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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      surfaceFeaturesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaces
+(
+    "CAD.obj"
+);
+
+includedAngle   150;
+
+subsetFeatures
+{
+    nonManifoldEdges yes;
+    openEdges        yes;
+}
+
+trimFeatures
+{
+    minElem         0;
+    minLen          0;
+}
+
+writeObj        yes;
+
+// ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/README b/etc/templates/inflowOutflowRotating/README
index 250b5a331..ecb355b45 100644
--- a/etc/templates/inflowOutflowRotating/README
+++ b/etc/templates/inflowOutflowRotating/README
@@ -31,7 +31,7 @@ Background Mesh
 
 Features
 ========
-+ Run surfaceFeatureExtract to extract features for explicit feature capturing
++ Run surfaceFeatures to extract features for explicit feature capturing
 
 Castellated Mesh
 ================
diff --git a/etc/templates/inflowOutflowRotating/system/surfaceFeaturesDict b/etc/templates/inflowOutflowRotating/system/surfaceFeaturesDict
new file mode 100644
index 000000000..8447795da
--- /dev/null
+++ b/etc/templates/inflowOutflowRotating/system/surfaceFeaturesDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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      surfaceFeaturesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaces
+(
+    "fixed.obj"
+    "rotating.obj"
+    "rotatingZone.obj"
+);
+
+includedAngle   150;
+
+subsetFeatures
+{
+    nonManifoldEdges yes;
+    openEdges        yes;
+}
+
+trimFeatures
+{
+    minElem         0;
+    minLen          0;
+}
+
+writeObj        yes;
+
+// ************************************************************************* //