Merge V8_4_BR branch.

diff --cc CMakeLists.txt
Simple merge

diff --cc src/AdvancedEngine/AdvancedEngine_IOperations.cxx
Simple merge

diff --cc src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx
Simple merge

diff --cc src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx
Simple merge

diff --cc src/BlockFix/BlockFix_UnionFaces.cxx
Simple merge

diff --cc src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
Simple merge

diff --cc src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
Simple merge

diff --cc src/GEOM/GEOM_BaseObject.cxx
Simple merge

diff --cc src/GEOM/GEOM_Engine.cxx
Simple merge

diff --cc src/GEOM/GEOM_Engine.hxx
Simple merge

diff --cc src/GEOM/GEOM_Field.cxx
Simple merge

diff --cc src/GEOM/GEOM_Function.cxx
Simple merge

diff --cc src/GEOM/GEOM_Function.hxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx
Simple merge

diff --cc src/GEOMGUI/GEOM_Displayer.cxx
Simple merge

diff --cc src/GEOMGUI/GEOM_Displayer.h
Simple merge

diff --cc src/GEOMGUI/GeometryGUI.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_GlueDriver.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_PipeDriver.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_PrismDriver.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
Simple merge

diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 862d95beb6643f13fbd593a23d4d483bb1c9896a,63064b051149a7e541fa5ce3f2485adf9b7abceb..7ccc970dd0e14bdc1dba09a1638bdd9e876f5253
--- 1/src/GEOM_I/GEOM_Gen_i.cc
--- 2/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@@ -262,9 -262,9 +262,9 @@@ SALOMEDS::SObject_ptr GEOM_Gen_i::Publi
    // BEGIN: try to find existed name for current shape
    if ( !aShape->_is_nil() && mytype != GEOM_GROUP)
    {
 -    // recieve current TopoDS shape
 +    // receive current TopoDS shape
      CORBA::String_var entry = aShape->GetEntry();
-     HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+     Handle(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast
        ( _impl->GetObject( aShape->GetStudyID(), entry ));
      TopoDS_Shape TopoSh = aGShape->GetValue();
      // find label of main shape

diff --cc src/OBJECT/GEOM_Annotation.hxx
Simple merge

diff --cc src/STEPPlugin/STEPPlugin_ExportDriver.cxx
Simple merge

diff --cc src/STLPlugin/STLPlugin_ExportDriver.cxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_ChangeOrientation.hxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_CloseContour.hxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_FillHoles.cxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_FillHoles.hxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_RemoveFace.hxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
Simple merge

diff --cc src/ShHealOper/ShHealOper_Sewing.hxx
Simple merge

diff --cc src/VTKPlugin/VTKPlugin_ExportDriver.cxx
Simple merge