diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 5e8a8d7297..3d256b2305 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -729,6 +729,48 @@ void Foam::conformationSurfaces::findEdgeNearestByType
     }
 }
 
+void Foam::conformationSurfaces::findAllNearestEdges
+(
+    const point& sample,
+    const scalar searchRadiusSqr,
+    List<List<pointIndexHit> >& edgeHitsByFeature,
+    List<label>& featuresHit
+) const
+{
+    // Initialise
+    //featuresHit.setSize(features_.size());
+    //featuresHit = -1;
+    //edgeHitsByFeature.setSize(features_.size());
+
+    // Work arrays
+    List<pointIndexHit> hitInfo(extendedFeatureEdgeMesh::nEdgeTypes);
+
+    forAll(features_, testI)
+    {
+        features_[testI].allNearestFeatureEdges
+        (
+            sample,
+            searchRadiusSqr,
+            hitInfo
+        );
+
+        bool anyHit = false;
+        forAll(hitInfo, hitI)
+        {
+            if (hitInfo[hitI].hit())
+            {
+                anyHit = true;
+            }
+        }
+
+        if (anyHit)
+        {
+            edgeHitsByFeature.append(hitInfo);
+            featuresHit.append(testI);
+        }
+    }
+}
+
 
 void Foam::conformationSurfaces::writeFeatureObj(const fileName& prefix) const
 {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index fe0b9f5527..fe883fbaa5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -270,7 +270,17 @@ public:
                 const point& sample,
                 scalar nearestDistSqr,
                 List<pointIndexHit>& edgeHit,
-                List<label>& featureHit
+                List<label>& featuresHit
+            ) const;
+
+            //- Find the nearest points on each feature edge that is within
+            //  a given distance from the sample point
+            void findAllNearestEdges
+            (
+                const point& sample,
+                const scalar searchRadiusSqr,
+                List<List<pointIndexHit> >& edgeHitsByFeature,
+                List<label>& featuresHit
             ) const;
 
             //- Find which patch is intersected by the line from one point to