diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3e272095015640cc5a4b65c806b5df54de27f2f..9852f327445212e2022931993aea5f2554bf15b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1077,7 +1077,8 @@ if(ENABLE_OCC)
       # ModelingData
       TKBRep TKGeomBase TKG3d TKG2d
       # FoundationClasses
-      TKAdvTools TKMath TKernel)
+      # TKAdvTools -- not necessary? (and removed from OCC 6.8)
+      TKMath TKernel)
   if(ENABLE_SGEOM)
     set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
       # For SGEOM
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index 125774adb24a0e78a157a42967e24cf973f3d7e6..3495091cbd38e8f6227c22815aab9df2182e1ea7 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -28,7 +28,11 @@
 #include <BRepMesh_FastDiscret.hxx>
 
 #if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
-#include <BOPInt_Context.hxx>
+#  if (OCC_VERSION_MINOR < 8)
+#  include <BOPInt_Context.hxx>
+#  else
+#  include <IntTools_Context.hxx>
+#  endif
 #include <BOPTools_AlgoTools2D.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #else
@@ -455,7 +459,7 @@ bool OCCFace::buildSTLTriangulation(bool force)
 void OCCFace::replaceEdgesInternal(std::list<GEdge*> &new_edges)
 {
 
-#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
+#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8)
   Handle(BOPInt_Context) myContext = new BOPInt_Context;
 #elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503
   Handle(IntTools_Context) myContext = new IntTools_Context;
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 54f2d57e737bde09e7d3a128a8e502a5f2f22f2f..8d5c618b143ca1a5a027737bc7b85e2e10f78838 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -809,6 +809,11 @@ Vertical position (in pixels) of the (detached) menu tree@*
 Default value: @code{400}@*
 Saved in: @code{General.SessionFileName}
 
+@item General.MessageFontSize
+Size of the font in the message window (-1=automatic)@*
+Default value: @code{-1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item General.MessageHeight
 Height (in pixels) of the message console when it is visible (should be > 0)@*
 Default value: @code{300}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 8ff1a0509d3ed71e1a781bab5e0d1f33b186b3e2..fca061be34d3ab45ede1f6fbeb60d3a175934126 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -659,6 +659,11 @@ Skip a model edge in mesh generation if its length is less than user's defined t
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Mesh.ToleranceInitialDelaunay
+Tolerance for initial 3D Delaunay mesher@*
+Default value: @code{1e-08}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Mesh.Triangles
 Display mesh triangles?@*
 Default value: @code{1}@*