Merge remote-tracking branch 'remotes/origin/master' into issue_2024

diff --cc src/SketchAPI/SketchAPI_Sketch.cpp
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Plugin.cpp
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Validators.cpp
index f224f99ebc4aff262e8c352002396bc757b27726,cb4b746b6de81389b3a75f4d5afef7170952ebf1..ce6ee3b3485f531fe145fbed96bfb7f78ffa5e98
--- 1/src/SketchPlugin/SketchPlugin_Validators.cpp
--- 2/src/SketchPlugin/SketchPlugin_Validators.cpp
+++ b/src/SketchPlugin/SketchPlugin_Validators.cpp
@@@ -10,13 -10,13 +10,14 @@@
  #include "SketchPlugin_Circle.h"
  #include "SketchPlugin_ConstraintCoincidence.h"
  #include "SketchPlugin_ConstraintDistance.h"
 -#include "SketchPlugin_Fillet.h"
  #include "SketchPlugin_ConstraintRigid.h"
  #include "SketchPlugin_ConstraintTangent.h"
 +#include "SketchPlugin_Fillet.h"
  #include "SketchPlugin_Line.h"
 +#include "SketchPlugin_MacroCircle.h"
  #include "SketchPlugin_Point.h"
  #include "SketchPlugin_Sketch.h"
+ #include "SketchPlugin_Trim.h"
  #include "SketchPlugin_Tools.h"
  
  #include "SketcherPrs_Tools.h"
@@@ -37,9 -37,9 +38,10 @@@
  #include <ModelAPI_ResultConstruction.h>
  
  #include <ModelGeomAlgo_Point2D.h>
+ #include <ModelGeomAlgo_Shape.h>
  
  #include <GeomAPI_Circ.h>
 +#include <GeomAPI_Dir2d.h>
  #include <GeomAPI_Lin.h>
  #include <GeomAPI_Edge.h>
  #include <GeomAPI_Vertex.h>

diff --cc src/SketchPlugin/SketchPlugin_Validators.h
Simple merge

diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge