diff --git a/etc/controlDict b/etc/controlDict
index 552f12c520..620d8a56a3 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -223,6 +223,11 @@ OptimisationSwitches
     //- Enable enforced consistency of constraint bcs after 'local' operations.
     //  Default is on. Set to 0/false to revert to <v2306 behaviour
     //localConsistency 0;
+
+    //- Since v2412 wall distance is calculated on a combined patch, created
+    //  from all the individual wall patches. Set to 0/false to revert to
+    //  <v2412 behaviour
+    //useCombinedWallPatch    0;
 }
 
 
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index aa9e0cd596..2404e0d57c 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -41,7 +41,7 @@ defineTypeNameAndDebug(cellDistFuncs, 0);
 
 bool Foam::cellDistFuncs::useCombinedWallPatch = true;
 
-registerInfoSwitch
+registerOptSwitch
 (
     "useCombinedWallPatch",
     bool,