diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
index 05814c2dbf..8539ab524d 100755
--- a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
+++ b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
@@ -21,6 +21,7 @@
 #include <BRepAlgoAPI_BooleanOperation.ixx>
 
 #include <BRepLib_FuseEdges.hxx>
+#include <BRepLib.hxx>
 #include <TopExp.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
@@ -295,7 +296,7 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
 	  myErrorStatus=0;
 	  myBuilderCanWork=Standard_True;
 	  myShape=myBuilder->Result();
-	  EnsureToleranceRule(myShape);
+	  BRepLib::UpdateTolerances(myShape);
 	  Done(); 
 	}
 	else {
@@ -318,8 +319,13 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
   if (!iErr) {
     myErrorStatus=0;
     myBuilderCanWork=Standard_True;
+<<<<<<< HEAD
     myShape=myBuilder->Shape();
     EnsureToleranceRule(myShape);
+=======
+    myShape=myBuilder->Result();
+    BRepLib::UpdateTolerances(myShape);
+>>>>>>> d61c0a6... BRepBuilderAPI_MakeShape::EnsureToleranceRule was replaced by
     Done(); 
   } 
   else {
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl
index 9a31f831d0..f68da80304 100755
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl
@@ -92,11 +92,6 @@ is
     is virtual;
     	---Purpose: Returns true if the shape S has been deleted.
 
-    EnsureToleranceRule (myclass; theS : Shape from TopoDS);
-    ---Purpose: Fixes all tolerances of shape theS and it's subshapes by the tolerance
-    -- rule: vertex tolerance >= edge tolerance >= face tolerance.
-    -- Edge or vertex tolerance which does not satisfy the tolerance rule will
-    -- be increased.
     
 fields
  
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
index bd64f1aef8..66839abcea 100755
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
@@ -117,66 +117,3 @@ Standard_Boolean BRepBuilderAPI_MakeShape::IsDeleted (const TopoDS_Shape& S)
 {
   return Standard_False;
 }
-
-
-
-//=======================================================================
-//function : EnsureToleranceRule
-//purpose  : 
-//=======================================================================
-
-void BRepBuilderAPI_MakeShape::EnsureToleranceRule(const TopoDS_Shape & theS)
-{
-  if (theS.IsNull())
-  {
-    return;
-  }
-  //
-  for (TopExp_Explorer aFE(theS, TopAbs_FACE); aFE.More(); aFE.Next())
-  {
-    TopoDS_Face aF = TopoDS::Face(aFE.Current());
-    Standard_Real aFT = ((Handle_BRep_TFace &)aF.TShape())->Tolerance();
-    //
-    for (TopExp_Explorer anEE(aF, TopAbs_EDGE); anEE.More(); anEE.Next())
-    {
-      TopoDS_Edge anES = TopoDS::Edge(anEE.Current());
-      Handle_BRep_TEdge & anEG = (Handle_BRep_TEdge &)anES.TShape();
-      Standard_Real anET = anEG->Tolerance();
-      if (anET < aFT)
-      {
-        anET = aFT;
-        anEG->Tolerance(anET);
-      }
-      for (TopExp_Explorer aVE(anES, TopAbs_VERTEX); aVE.More(); aVE.Next())
-      {
-        TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
-        Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
-        aVG->UpdateTolerance(anET);
-      }
-    }
-    //
-    for (TopExp_Explorer aVE(aF, TopAbs_VERTEX, TopAbs_EDGE);
-      aVE.More(); aVE.Next())
-    {
-      TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
-      Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
-      aVG->UpdateTolerance(aFT);
-    }
-  }
-  //
-  for (TopExp_Explorer anEE(theS, TopAbs_EDGE, TopAbs_FACE);
-    anEE.More(); anEE.Next())
-  {
-    TopoDS_Edge anES = TopoDS::Edge(anEE.Current());
-    Handle_BRep_TEdge & anEG = (Handle_BRep_TEdge &)anES.TShape();
-    Standard_Real anET = anEG->Tolerance();
-    for (TopExp_Explorer aVE(anES, TopAbs_VERTEX); aVE.More(); aVE.Next())
-    {
-      TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
-      Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
-      aVG->UpdateTolerance(anET);
-    }
-  }
-}
-
-
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
index 2e6b2de632..b2b0212017 100755
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -127,7 +127,6 @@
 #include <BRepBuilderAPI_VertexInspector.hxx>
 #include <BRepBuilderAPI_CellFilter.hxx>
 #include <BRepBuilderAPI_BndBoxTreeSelector.hxx>
-#include <BRepBuilderAPI_MakeShape.hxx>
 #include <NCollection_UBTreeFiller.hxx>
 
 static void SortBox (const Handle(Bnd_HArray1OfBox) hSetBoxes,
@@ -1910,7 +1909,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
       mySewedShape.Nullify();
       return;
     }
-    BRepBuilderAPI_MakeShape::EnsureToleranceRule(mySewedShape);
+    BRepLib::UpdateTolerances(mySewedShape);
   }
 #if DEB
   chr_total.Stop();
diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx
index c95badcf42..a457764675 100755
--- a/src/BRepFeat/BRepFeat_MakePrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.cxx
@@ -45,6 +45,8 @@
 
 #include <BRep_Tool.hxx>
 
+#include <BRepLib.hxx>
+
 #include <BRepTools.hxx>
 
 
@@ -463,7 +465,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
       }
     }         
   }
-  EnsureToleranceRule(myShape);
+  BRepLib::UpdateTolerances(myShape);
 /*   // loop of control of descendance
 
   TopExp_Explorer expr(mySbase, TopAbs_FACE);
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
index 3ec82c9a1b..a6da6c6463 100755
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
@@ -25,6 +25,7 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <TopExp_Explorer.hxx>
+#include <BRepLib.hxx>
 
 
 
@@ -391,7 +392,7 @@ void BRepFilletAPI_MakeChamfer::Build()
   if (myBuilder.IsDone()){
     Done();
     myShape = myBuilder.Shape();
-    EnsureToleranceRule(myShape);
+    BRepLib::UpdateTolerances(myShape);
       
       //creation of the Map.
     TopExp_Explorer ex;
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
index 5c7c465e18..b8ccc2f031 100755
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
@@ -30,6 +30,7 @@
 #include <Law_Linear.hxx>
 #include <Law_S.hxx>
 #include <Law_Interpol.hxx>
+#include <BRepLib.hxx>
 
 //=======================================================================
 //function : BRepFilletAPI_MakeFillet
@@ -532,7 +533,7 @@ void BRepFilletAPI_MakeFillet::Build()
   if(myBuilder.IsDone()) {
     Done();
     myShape = myBuilder.Shape();
-    EnsureToleranceRule(myShape);
+    BRepLib::UpdateTolerances(myShape);
 
     // creation of the Map.
     TopExp_Explorer ex;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
index 9c1f484cbb..8b06baa3d7 100755
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
@@ -21,6 +21,7 @@
 
 #include <BRepOffsetAPI_MakePipe.ixx>
 
+#include <BRepLib.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
@@ -59,7 +60,7 @@ const BRepFill_Pipe& BRepOffsetAPI_MakePipe::Pipe() const
 void BRepOffsetAPI_MakePipe::Build() 
 {
   myShape = myPipe.Shape();
-  BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
+  BRepLib::UpdateTolerances(myShape);
   Done();
 }
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
index e0f58cb9e3..de3fb85005 100755
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
@@ -22,6 +22,7 @@
 
 #include <BRepOffsetAPI_MakePipeShell.ixx>
 
+#include <BRepLib.hxx>
 #include <GeomFill_PipeError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
@@ -225,7 +226,7 @@ void BRepOffsetAPI_MakePipeShell::Delete( const TopoDS_Shape& Profile)
   Ok = myPipe->Build();
   if (Ok) {
     myShape = myPipe->Shape();
-    EnsureToleranceRule(myShape);
+    BRepLib::UpdateTolerances(myShape);
     Done();
   }
   else NotDone(); 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
index 80771ecc06..e8e9749b93 100755
--- a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
@@ -20,6 +20,7 @@
 
 
 #include <BRepOffsetAPI_NormalProjection.ixx>
+#include <BRepLib.hxx>
 
 BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
 {
@@ -64,7 +65,7 @@ BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
 {
   myNormalProjector.Build();
   myShape = myNormalProjector.Projection();
-  BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
+  BRepLib::UpdateTolerances(myShape);
   Done();
 }
 
diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx
index 033cb56e5d..a2c57d2deb 100755
--- a/src/BRepTest/BRepTest_BasicCommands.cxx
+++ b/src/BRepTest/BRepTest_BasicCommands.cxx
@@ -815,7 +815,7 @@ static Standard_Integer EnsureTolRule(
   }
   //
   TopoDS_Shape aRes = BRepBuilderAPI_Copy(aS);
-  BRepBuilderAPI_MakeShape::EnsureToleranceRule(aRes);
+  BRepLib::UpdateTolerances(aRes);
   //
   DBRep::Set(theAs[1], aRes);
   return 0;
diff --git a/src/ShapeFix/ShapeFix_Shape.cxx b/src/ShapeFix/ShapeFix_Shape.cxx
index cb2cfeab6f..fbe2d5ec01 100755
--- a/src/ShapeFix/ShapeFix_Shape.cxx
+++ b/src/ShapeFix/ShapeFix_Shape.cxx
@@ -33,7 +33,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeShape.hxx>
+#include <BRepLib.hxx>
 
 #include <ShapeFix.hxx>
 #include <ShapeBuild_ReShape.hxx>
@@ -103,7 +103,7 @@ void ShapeFix_Shape::Init(const TopoDS_Shape& shape)
 Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
 {
   Standard_Boolean aR = PerformR(theProgress);
-  BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
+  BRepLib::UpdateTolerances(myResult);
   return aR;
 }
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
index fafad09633..254e0c3572 100755
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
@@ -37,7 +37,7 @@
 #include <ShapeUpgrade_WireDivide.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
-#include <BRepBuilderAPI_MakeShape.hxx>
+#include <BRepLib.hxx>
 
 //=======================================================================
 //function : ShapeUpgrade_ShapeDivide
@@ -175,7 +175,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
     if ( Status ( ShapeExtend_DONE ) ) {
       myResult = myContext->Apply ( C, TopAbs_SHAPE );
       myContext->Replace ( myShape, myResult );
-      BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
+      BRepLib::UpdateTolerances(myResult);
       return Standard_True;
     }
     myResult = myShape;
@@ -284,7 +284,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
     }
   }
   myResult = myContext->Apply ( myShape, TopAbs_SHAPE );
-  BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
+  BRepLib::UpdateTolerances(myResult);
   return ! myResult.IsSame ( myShape );
 }