diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
index 359021075a..b41409bd2d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
@@ -40,7 +40,8 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh(const Time& runTime)
     Triangulation(),
     vertexCount_(0),
     cellCount_(0),
-    runTime_(runTime)
+    runTime_(runTime),
+    rndGen_(64293*Pstream::myProcNo())
 {}
 
 
@@ -54,7 +55,8 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh
     Triangulation(),
     vertexCount_(0),
     cellCount_(0),
-    runTime_(runTime)
+    runTime_(runTime),
+    rndGen_(64293*Pstream::myProcNo())
 {
     Info<< "Reading " << meshName << " from " << runTime.name() << endl;
 
@@ -302,7 +304,7 @@ Foam::Map<Foam::label> Foam::DelaunayMesh<Triangulation>::rangeInsertWithInfo
         );
     }
 
-    std::random_shuffle(points.begin(), points.end());
+    rndGen().permute(points);
 
     spatial_sort
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 3aa207dd8f..769b504c77 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,6 +45,7 @@ SourceFiles
 #include "CGALTriangulation3Ddefs.H"
 #include "Time.H"
 #include "autoPtr.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -106,6 +107,9 @@ private:
         //- Reference to Time
         const Time& runTime_;
 
+        //- Random number generator
+        mutable Random rndGen_;
+
         //- Spatial sort traits to use with a pair of point pointers and an int.
         //  Taken from a post on the CGAL lists: 2010-01/msg00004.html by
         //  Sebastien Loriot (Geometry Factory).
@@ -219,6 +223,10 @@ public:
             inline void resetVertexCount();
 
 
+        //- Access the random number generator
+        inline Random& rndGen() const;
+
+
         // Triangulation manipulation functions
 
             //- Clear the entire triangulation
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
index 073127cdb3..4971413721 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ inline const Foam::Time& Foam::DelaunayMesh<Triangulation>::time() const
 
 
 template<class Triangulation>
-void Foam::DelaunayMesh<Triangulation>::timeCheck
+inline void Foam::DelaunayMesh<Triangulation>::timeCheck
 (
     const string& description,
     const bool check
@@ -90,31 +90,38 @@ inline Foam::label Foam::DelaunayMesh<Triangulation>::getNewVertexIndex() const
 
 
 template<class Triangulation>
-Foam::label Foam::DelaunayMesh<Triangulation>::cellCount() const
+inline Foam::label Foam::DelaunayMesh<Triangulation>::cellCount() const
 {
     return cellCount_;
 }
 
 
 template<class Triangulation>
-Foam::label Foam::DelaunayMesh<Triangulation>::vertexCount() const
+inline Foam::label Foam::DelaunayMesh<Triangulation>::vertexCount() const
 {
     return vertexCount_;
 }
 
 
 template<class Triangulation>
-void Foam::DelaunayMesh<Triangulation>::resetCellCount()
+inline void Foam::DelaunayMesh<Triangulation>::resetCellCount()
 {
     cellCount_ = 0;
 }
 
 
 template<class Triangulation>
-void Foam::DelaunayMesh<Triangulation>::resetVertexCount()
+inline void Foam::DelaunayMesh<Triangulation>::resetVertexCount()
 {
     vertexCount_ = 0;
 }
 
 
+template<class Triangulation>
+inline Foam::Random& Foam::DelaunayMesh<Triangulation>::rndGen() const
+{
+    return rndGen_;
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index c7c60bcf88..fa6cb3efae 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -900,7 +900,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
         );
     }
 
-    std::random_shuffle(pointsBbDistSqr.begin(), pointsBbDistSqr.end());
+    this->rndGen().permute(pointsBbDistSqr);
 
     // Sort in ascending order by the distance of the point from the centre
     // of the processor bounding box
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 9daec62ed9..4535582e52 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -827,7 +827,6 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 :
     DistributedDelaunayMesh<Delaunay>(runTime),
     runTime_(runTime),
-    rndGen_(64293*Pstream::myProcNo()),
     foamyHexMeshControls_(foamyHexMeshDict),
     allGeometry_
     (
@@ -846,7 +845,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
     geometryToConformTo_
     (
         runTime_,
-        rndGen_,
+        rndGen(),
         allGeometry_,
         foamyHexMeshDict.subDict("surfaceConformation")
     ),
@@ -856,7 +855,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
       ? new backgroundMeshDecomposition
         (
             runTime_,
-            rndGen_,
+            rndGen(),
             geometryToConformTo_,
             foamyHexMeshControls().foamyHexMeshDict().subDict
             (
@@ -884,7 +883,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
         (
             foamyHexMeshDict.subDict("initialPoints"),
             runTime_,
-            rndGen_,
+            rndGen(),
             geometryToConformTo_,
             cellShapeControl_,
             decomposition_
@@ -986,7 +985,7 @@ void Foam::conformalVoronoiMesh::initialiseForConformation()
             new backgroundMeshDecomposition
             (
                 runTime_,
-                rndGen_,
+                rndGen(),
                 geometryToConformTo_,
                 foamyHexMeshControls().foamyHexMeshDict().subDict
                 (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 730e662e86..500214ae5f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,9 +139,6 @@ private:
         //- The time registry of the application
         const Time& runTime_;
 
-        //- Random number generator
-        mutable Random rndGen_;
-
         //- Controls for the conformal Voronoi meshing process
         cvControls foamyHexMeshControls_;
 
@@ -902,9 +899,6 @@ public:
             //- Return the Time object
             inline const Time& time() const;
 
-            //- Return the random number generator
-            inline Random& rndGen() const;
-
             //- Return the allGeometry object
             inline const searchableSurfaces& allGeometry() const;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 7abf36ccc4..604706dd4a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -293,9 +293,9 @@ inline Foam::point Foam::conformalVoronoiMesh::perturbPoint
 
     scalar pert = 1e-12*defaultCellSize();
 
-    perturbedPt.x() += pert*(rndGen_.scalar01() - 0.5);
-    perturbedPt.y() += pert*(rndGen_.scalar01() - 0.5);
-    perturbedPt.z() += pert*(rndGen_.scalar01() - 0.5);
+    perturbedPt.x() += pert*(rndGen().scalar01() - 0.5);
+    perturbedPt.y() += pert*(rndGen().scalar01() - 0.5);
+    perturbedPt.z() += pert*(rndGen().scalar01() - 0.5);
 
     return perturbedPt;
 }
@@ -533,12 +533,6 @@ inline const Foam::Time& Foam::conformalVoronoiMesh::time() const
 }
 
 
-inline Foam::Random& Foam::conformalVoronoiMesh::rndGen() const
-{
-    return rndGen_;
-}
-
-
 inline const Foam::searchableSurfaces&
 Foam::conformalVoronoiMesh::allGeometry() const
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index 8461103f52..b29d385386 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -566,7 +566,7 @@ bool Foam::autoDensity::fillBox
         // Randomise the order of the points to (potentially) improve the speed
         // of assessing the density ratio, and prevent a box being filled from a
         // corner when only some these points are required.
-        shuffle(samplePoints);
+        rndGen().permute(samplePoints);
 
         scalarField sampleSizes = cellShapeControls().cellSize(samplePoints);
 
diff --git a/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C b/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
index e9b3bbc93d..3303543494 100644
--- a/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
+++ b/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
@@ -264,10 +264,7 @@ Foam::boundSphere(const PointField& ps, Random& rndGen)
     else
     {
         labelList pis(identity(ps.size()));
-        forAll(pis, i)
-        {
-            Swap(pis[i], pis[rndGen.sampleAB<label>(i, ps.size())]);
-        }
+        rndGen.permute(pis);
         FixedList<label, 4> boundaryPis({-1, -1, -1, -1});
         return weizlBoundSphere(ps, pis, ps.size(), boundaryPis, 0);
     }
@@ -286,11 +283,7 @@ Foam::boundSphere(const PointField& ps)
     else
     {
         labelList pis(identity(ps.size()));
-        Random rndGen(0);
-        forAll(pis, i)
-        {
-            Swap(pis[i], pis[rndGen.sampleAB<label>(i, ps.size())]);
-        }
+        Random(0).permute(pis);
         FixedList<label, 4> boundaryPis({-1, -1, -1, -1});
         return weizlBoundSphere(ps, pis, ps.size(), boundaryPis, 0);
     }
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index 6fc2544982..b3d4bf03c6 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.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-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,13 +139,6 @@ void Foam::stableSort(UList<T>& a, const Cmp& cmp)
 }
 
 
-template<class T>
-void Foam::shuffle(UList<T>& a)
-{
-    std::random_shuffle(a.begin(), a.end());
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index c3fc45e3e7..a5553d03f2 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -395,9 +395,6 @@ void stableSort(UList<T>&);
 template<class T, class Cmp>
 void stableSort(UList<T>&, const Cmp&);
 
-template<class T>
-void shuffle(UList<T>&);
-
 // Reverse the first n elements of the list
 template<class T>
 inline void reverse(UList<T>&, const label n);
diff --git a/src/OpenFOAM/primitives/Random/Random.H b/src/OpenFOAM/primitives/Random/Random.H
index 4ad6de5c4d..eecf25eb3a 100644
--- a/src/OpenFOAM/primitives/Random/Random.H
+++ b/src/OpenFOAM/primitives/Random/Random.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,6 +141,11 @@ public:
             //  cores. Use of this is discouraged. It is expensive and
             //  introduces non-randomness in all cores other then the master.
             scalar globalScalar01();
+
+
+        //- Randomly permute a list
+        template<class Container>
+        inline void permute(Container& l);
 };
 
 
diff --git a/src/OpenFOAM/primitives/Random/RandomI.H b/src/OpenFOAM/primitives/Random/RandomI.H
index 843611b1fb..b1b505c4ba 100644
--- a/src/OpenFOAM/primitives/Random/RandomI.H
+++ b/src/OpenFOAM/primitives/Random/RandomI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,6 @@ inline Foam::Random::type Foam::Random::sample()
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::Random::Random(const label s)
@@ -136,4 +135,14 @@ inline Foam::scalar Foam::Random::sampleNormal()
 }
 
 
+template<class Container>
+inline void Foam::Random::permute(Container& l)
+{
+    for (label i = 0; i < l.size(); ++ i)
+    {
+        Swap(l[i], l[sampleAB<label>(i, l.size())]);
+    }
+}
+
+
 // ************************************************************************* //