diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
index c97477563c..3dc6964523 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFlux.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,6 +63,14 @@ namespace fvc
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
+    template<class Type>
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    (
+        const surfaceScalarField&,
+        const GeometricField<Type, fvPatchField, volMesh>&,
+        Istream& schemeData
+    );
+
     template<class Type>
     tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
     (
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
index 0bb84a423b..feb37b27d9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,18 +45,31 @@ flux
 (
     const surfaceScalarField& phi,
     const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const word& name
+    Istream& schemeData
 )
 {
     return fv::convectionScheme<Type>::New
     (
         vf.mesh(),
         phi,
-        vf.mesh().divScheme(name)
+        schemeData
     )().flux(phi, vf);
 }
 
 
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+flux
+(
+    const surfaceScalarField& phi,
+    const GeometricField<Type, fvPatchField, volMesh>& vf,
+    const word& name
+)
+{
+    return fvc::flux(phi, vf, vf.mesh().divScheme(name));
+}
+
+
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
 flux