diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 41d12f1ddf..c1c3075259 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -131,14 +131,7 @@ int main(int argc, char *argv[])
 
                         if (correctPhi)
                         {
-                            // Calculate absolute flux
-                            // from the mapped surface velocity
-                            phi = mesh.Sf() & rhoUf();
-
                             #include "correctPhi.H"
-
-                            // Make the fluxes relative to the mesh-motion
-                            fvc::makeRelative(phi, rho, U);
                         }
 
                         if (checkMeshCourantNo)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/correctPhi.H b/applications/solvers/compressible/rhoPimpleFoam/correctPhi.H
index 3cd82d29e7..d9c9d641fb 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/correctPhi.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/correctPhi.H
@@ -1,12 +1,19 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & rhoUf();
+
+correctUphiBCs(rho, U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
     p,
     rho,
     psi,
     dimensionedScalar("rAUf", dimTime, 1),
     divrhoU(),
-    pimple,
-    true
+    pimple
 );
+
+// Make the fluxes relative to the mesh-motion
+fvc::makeRelative(phi, rho, U);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 9109d8ebd4..1147b4ab61 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -124,14 +124,7 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & rhoUf();
-
                         #include "correctPhi.H"
-
-                        // Make the fluxes relative to the mesh-motion
-                        fvc::makeRelative(phi, rho, U);
                     }
 
                     if (checkMeshCourantNo)
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 0ece5b62c9..15192f198d 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -128,14 +128,7 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & rhoUf();
-
                         #include "correctPhi.H"
-
-                        // Make the fluxes relative to the mesh-motion
-                        fvc::makeRelative(phi, rho, U);
                     }
 
                     if (checkMeshCourantNo)
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H
index 253486727f..6d61a1b1f5 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H
@@ -1,12 +1,19 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & rhoUf();
+
+correctUphiBCs(rho, U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
     p_rgh,
     rho,
     psi,
     dimensionedScalar("rAUf", dimTime, 1),
     divrhoU(),
-    pimple,
-    true
+    pimple
 );
+
+// Make the fluxes relative to the mesh-motion
+fvc::makeRelative(phi, rho, U);
diff --git a/applications/solvers/incompressible/pimpleFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/correctPhi.H
index eecfef8820..155a83c2e2 100644
--- a/applications/solvers/incompressible/pimpleFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/correctPhi.H
@@ -1,12 +1,20 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & Uf();
+
+correctUphiBCs(U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
+    U,
     p,
     dimensionedScalar("rAUf", dimTime, 1),
     geometricZeroField(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phi, U);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 0a06bd16fe..a3ac0e0c85 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -99,14 +99,7 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf();
-
                         #include "correctPhi.H"
-
-                        // Make the flux relative to the mesh motion
-                        fvc::makeRelative(phi, U);
                     }
 
                     if (checkMeshCourantNo)
diff --git a/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H b/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H
index 03bda9b113..e9170f3990 100644
--- a/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H
+++ b/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H
@@ -1,12 +1,19 @@
+// Calculate absolute flux from the mapped surface velocity
+phic = mesh.Sf() & Ucf();
+
+correctUphiBCs(Uc, phic, true);
+
 CorrectPhi
 (
-    Uc,
     phic,
+    Uc,
     p,
     dimensionedScalar("rAUf", dimTime, 1),
     geometricZeroField(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phic, Uc);
diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C
index 58e6405a49..35830b1369 100644
--- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C
+++ b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C
@@ -119,13 +119,7 @@ int main(int argc, char *argv[])
         {
             if (correctPhi)
             {
-                // Calculate absolute flux from the mapped surface velocity
-                phic = mesh.Sf() & Ucf();
-
                 #include "correctPhic.H"
-
-                // Make the flux relative to the mesh motion
-                fvc::makeRelative(phic, Uc);
             }
 
             if (checkMeshCourantNo)
diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C
index fb6d8530ed..e90665ba0a 100644
--- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C
+++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C
@@ -126,14 +126,7 @@ int main(int argc, char *argv[])
 
             if (correctPhi)
             {
-                // Calculate absolute flux
-                // from the mapped surface velocity
-                phi = mesh.Sf() & rhoUf();
-
                 #include "../../compressible/rhoPimpleFoam/correctPhi.H"
-
-                // Make the fluxes relative to the mesh-motion
-                fvc::makeRelative(phi, rho, U);
             }
 
             if (checkMeshCourantNo)
diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C
index d58ce84e6e..b8a3171c9e 100644
--- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C
+++ b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C
@@ -125,14 +125,7 @@ int main(int argc, char *argv[])
 
             if (correctPhi)
             {
-                // Calculate absolute flux
-                // from the mapped surface velocity
-                phi = mesh.Sf() & rhoUf();
-
                 #include "../../compressible/rhoPimpleFoam/correctPhi.H"
-
-                // Make the fluxes relative to the mesh-motion
-                fvc::makeRelative(phi, rho, U);
             }
 
             if (checkMeshCourantNo)
diff --git a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C
index b75f62fbf6..74a5bb4740 100644
--- a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C
+++ b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C
@@ -122,14 +122,7 @@ int main(int argc, char *argv[])
 
             if (correctPhi)
             {
-                // Calculate absolute flux
-                // from the mapped surface velocity
-                phi = mesh.Sf() & rhoUf();
-
                 #include "../../compressible/rhoPimpleFoam/correctPhi.H"
-
-                // Make the fluxes relative to the mesh-motion
-                fvc::makeRelative(phi, rho, U);
             }
 
             if (checkMeshCourantNo)
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index ccfceaf1b8..cee5b9033e 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,13 +80,7 @@ int main(int argc, char *argv[])
 
             if (mesh.changing() && correctPhi)
             {
-                // Calculate absolute flux from the mapped surface velocity
-                phi = mesh.Sf() & Uf();
-
                 #include "correctPhi.H"
-
-                // Make the flux relative to the mesh motion
-                fvc::makeRelative(phi, U);
             }
         }
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
index f1d86e5ef6..cf3aa9351d 100644
--- a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
+++ b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H
@@ -1,3 +1,6 @@
+// Calculate absolute flux from the mapped surface velocity
+phi = mesh.Sf() & Uf();
+
 correctUphiBCs(U, phi, true);
 
 {
@@ -36,3 +39,6 @@ correctUphiBCs(U, phi, true);
         }
     }
 }
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phi, U);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H
index 2c4ea62aa8..751443ca29 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H
@@ -2,15 +2,16 @@
 // from the mapped surface velocity
 phi = mesh.Sf() & Uf();
 
+correctUphiBCs(U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
+    U,
     p_rgh,
     surfaceScalarField("rAUf", fvc::interpolate(rAU())),
     divU(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index 8a4682c882..094a636bd4 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -2,30 +2,30 @@
 // from the mapped surface velocity
 phi = mesh.Sf() & Uf();
 
+correctUphiBCs(U, phi, true);
+
 if (divU.valid())
 {
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         surfaceScalarField("rAUf", fvc::interpolate(rAU())),
         divU(),
-        pimple,
-        true
+        pimple
     );
 }
 else
 {
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         surfaceScalarField("rAUf", fvc::interpolate(rAU())),
         geometricZeroField(),
-        pimple,
-        true
+        pimple
     );
 }
 
diff --git a/applications/solvers/multiphase/interFoam/initCorrectPhi.H b/applications/solvers/multiphase/interFoam/initCorrectPhi.H
index 27a3179ad4..4359ad5e42 100644
--- a/applications/solvers/multiphase/interFoam/initCorrectPhi.H
+++ b/applications/solvers/multiphase/interFoam/initCorrectPhi.H
@@ -20,28 +20,30 @@ if
             dimensionedScalar(dimTime/dimDensity, 1)
         );
 
+        correctUphiBCs(U, phi, true);
+
         CorrectPhi
         (
-            U,
             phi,
+            U,
             p_rgh,
             surfaceScalarField("rAUf", fvc::interpolate(rAU())),
             geometricZeroField(),
-            pimple,
-            false
+            pimple
         );
     }
     else
     {
+        correctUphiBCs(U, phi, true);
+
         CorrectPhi
         (
-            U,
             phi,
+            U,
             p_rgh,
             dimensionedScalar(dimTime/rho.dimensions(), 1),
             geometricZeroField(),
-            pimple,
-            false
+            pimple
         );
     }
 }
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/interMixingFoam/correctPhi.H
index 89d8dd51f2..923aa2ae5b 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/correctPhi.H
@@ -1,12 +1,20 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & Uf();
+
+correctUphiBCs(U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
+    U,
     p_rgh,
     surfaceScalarField("rAUf", fvc::interpolate(rAU())),
     geometricZeroField(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phi, U);
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H b/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H
index e53175c43d..677963a993 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H
@@ -16,30 +16,32 @@ if (correctPhi)
         dimensionedScalar(dimTime/dimDensity, 1)
     );
 
+    correctUphiBCs(U, phi, true);
+
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         surfaceScalarField("rAUf", fvc::interpolate(rAU())),
         geometricZeroField(),
-        pimple,
-        false
+        pimple
     );
 
     #include "continuityErrs.H"
 }
 else
 {
+    correctUphiBCs(U, phi, true);
+
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         dimensionedScalar(dimTime/rho.dimensions(), 1),
         geometricZeroField(),
-        pimple,
-        false
+        pimple
     );
 
     #include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 09b8ecd3ac..c3090d0208 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -106,15 +106,8 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf();
-
                         #include "correctPhi.H"
 
-                        // Make the flux relative to the mesh motion
-                        fvc::makeRelative(phi, U);
-
                         mixture.correct();
                     }
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/correctPhi.H b/applications/solvers/multiphase/multiphaseInterFoam/correctPhi.H
index 89d8dd51f2..923aa2ae5b 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/correctPhi.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/correctPhi.H
@@ -1,12 +1,20 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & Uf();
+
+correctUphiBCs(U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
+    U,
     p_rgh,
     surfaceScalarField("rAUf", fvc::interpolate(rAU())),
     geometricZeroField(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phi, U);
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H b/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H
index e53175c43d..677963a993 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H
@@ -16,30 +16,32 @@ if (correctPhi)
         dimensionedScalar(dimTime/dimDensity, 1)
     );
 
+    correctUphiBCs(U, phi, true);
+
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         surfaceScalarField("rAUf", fvc::interpolate(rAU())),
         geometricZeroField(),
-        pimple,
-        false
+        pimple
     );
 
     #include "continuityErrs.H"
 }
 else
 {
+    correctUphiBCs(U, phi, true);
+
     CorrectPhi
     (
-        U,
         phi,
+        U,
         p_rgh,
         dimensionedScalar(dimTime/rho.dimensions(), 1),
         geometricZeroField(),
-        pimple,
-        false
+        pimple
     );
 
     #include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index f1e652e9e9..c00401250f 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -100,14 +100,7 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf();
-
                         #include "correctPhi.H"
-
-                        // Make the flux relative to the mesh motion
-                        fvc::makeRelative(phi, U);
                     }
 
                     mixture.correct();
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H
index 2303e61ce9..3305fcd92f 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H
@@ -1,12 +1,20 @@
+// Calculate absolute flux
+// from the mapped surface velocity
+phi = mesh.Sf() & Uf();
+
+correctUphiBCs(U, phi, true);
+
 CorrectPhi
 (
-    U,
     phi,
+    U,
     p_gh,
     surfaceScalarField("rAUf", fvc::interpolate(rAU)),
     geometricZeroField(),
-    pimple,
-    true
+    pimple
 );
 
 #include "continuityErrs.H"
+
+// Make the flux relative to the mesh motion
+fvc::makeRelative(phi, U);
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/initCorrectPhi.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/initCorrectPhi.H
new file mode 100644
index 0000000000..4650a8d58f
--- /dev/null
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/initCorrectPhi.H
@@ -0,0 +1,14 @@
+if (!runTime.restart() &&correctPhi)
+{
+    correctUphiBCs(U, phi, true);
+
+    CorrectPhi
+    (
+        phi,
+        U,
+        p_gh,
+        surfaceScalarField("rAUf", fvc::interpolate(rAU)),
+        geometricZeroField(),
+        pimple
+    );
+}
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index 826bda9175..cda3d891b1 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -73,10 +73,7 @@ int main(int argc, char *argv[])
         dimensionedScalar(dimTime, 1.0)
     );
 
-    if (correctPhi)
-    {
-        #include "correctPhi.H"
-    }
+    #include "initCorrectPhi.H"
 
     #include "createUfIfPresent.H"
 
@@ -115,14 +112,7 @@ int main(int argc, char *argv[])
 
                     if (correctPhi)
                     {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf();
-
                         #include "correctPhi.H"
-
-                        // Make the flux relative to the mesh motion
-                        fvc::makeRelative(phi, U);
                     }
 
                     if (checkMeshCourantNo)
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
index 422ebae4d9..7838b77219 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,20 +41,17 @@ License
 template<class RAUfType, class DivUType>
 void Foam::CorrectPhi
 (
-    volVectorField& U,
     surfaceScalarField& phi,
+    const volVectorField& U,
     const volScalarField& p,
     const RAUfType& rAUf,
     const DivUType& divU,
-    nonOrthogonalSolutionControl& pcorrControl,
-    const bool evaluateUBCs
+    nonOrthogonalSolutionControl& pcorrControl
 )
 {
-    const fvMesh& mesh = U.mesh();
+    const fvMesh& mesh = phi.mesh();
     const Time& runTime = mesh.time();
 
-    correctUphiBCs(U, phi, evaluateUBCs);
-
     // Initialize BCs list for pcorr to zero-gradient
     wordList pcorrTypes
     (
@@ -117,22 +114,18 @@ void Foam::CorrectPhi
 template<class RAUfType, class DivRhoUType>
 void Foam::CorrectPhi
 (
-    volVectorField& U,
     surfaceScalarField& phi,
     const volScalarField& p,
     const volScalarField& rho,
     const volScalarField& psi,
     const RAUfType& rAUf,
     const DivRhoUType& divRhoU,
-    nonOrthogonalSolutionControl& pcorrControl,
-    const bool evaluateUBCs
+    nonOrthogonalSolutionControl& pcorrControl
 )
 {
-    const fvMesh& mesh = U.mesh();
+    const fvMesh& mesh = phi.mesh();
     const Time& runTime = mesh.time();
 
-    correctUphiBCs(rho, U, phi, evaluateUBCs);
-
     // Initialize BCs list for pcorr to zero-gradient
     wordList pcorrTypes
     (
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
index 88016f7930..9c6d079668 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,27 +72,24 @@ namespace Foam
     template<class RAUfType, class DivUType>
     void CorrectPhi
     (
-        volVectorField& U,
         surfaceScalarField& phi,
+        const volVectorField& U,
         const volScalarField& p,
         const RAUfType& rAUf,
         const DivUType& divU,
-        nonOrthogonalSolutionControl& pcorrControl,
-        const bool evaluateUBCs
+        nonOrthogonalSolutionControl& pcorrControl
     );
 
     template<class RAUfType, class DivRhoUType>
     void CorrectPhi
     (
-        volVectorField& U,
         surfaceScalarField& phi,
         const volScalarField& p,
         const volScalarField& rho,
         const volScalarField& psi,
         const RAUfType& rAUf,
         const DivRhoUType& divRhoU,
-        nonOrthogonalSolutionControl& pcorrControl,
-        const bool evaluateUBCs
+        nonOrthogonalSolutionControl& pcorrControl
     );
 }