diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae8ae32e..384a493e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 # Set up the project
 project(guix
diff --git a/common/inc/gx_api.h b/common/inc/gx_api.h
index b53eaa76..13436114 100644
--- a/common/inc/gx_api.h
+++ b/common/inc/gx_api.h
@@ -117,7 +117,7 @@
 /*  03-01-2024     Ting Zhu                 Modified comment(s),          */
 /*                                            updated patch version,      */
 /*                                            resulting in version 6.4.1  */
-/*  02-19-2025     Frédéric Desbiens        Modified comment(s),          */
+/*  02-19-2025     Fr�d�ric Desbiens        Modified comment(s),          */
 /*                                            update version number,      */
 /*                                            resulting in version 6.4.2  */
 /*                                                                        */
@@ -141,9 +141,11 @@ extern   "C" {
    and the GUIX source as well.  */
 
 #define AZURE_RTOS_GUIX
-#define GUIX_MAJOR_VERSION 6
-#define GUIX_MINOR_VERSION 4
-#define GUIX_PATCH_VERSION 2
+#define GUIX_MAJOR_VERSION  6
+#define GUIX_MINOR_VERSION  4
+#define GUIX_PATCH_VERSION  3
+#define GUIX_BUILD_VERSION  202503
+#define GUIX_HOTFIX_VERSION ''
 
 /* The following symbols are defined for backward compatibility reasons.*/
 #define __PRODUCT_GUIX__
diff --git a/common/src/gx_canvas_arc_draw.c b/common/src/gx_canvas_arc_draw.c
index 855a84f9..ba9d2cf2 100644
--- a/common/src/gx_canvas_arc_draw.c
+++ b/common/src/gx_canvas_arc_draw.c
@@ -188,6 +188,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
         }
 
         /* we have a view into which we can draw the arc, do it */
+        GX_RECTANGLE *original_clip = context->gx_draw_context_clip;
         context -> gx_draw_context_clip = &clip_rect;
 
         if (brush -> gx_brush_style & (GX_BRUSH_SOLID_FILL | GX_BRUSH_PIXELMAP_FILL))
@@ -200,6 +201,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
             outline_function(context, xcenter, ycenter, r, start_angle, end_angle);
         }
         view = view -> gx_view_next;
+        context -> gx_draw_context_clip = original_clip;
     }
 
     /* Return successful completion.  */
diff --git a/common/src/gx_canvas_circle_draw.c b/common/src/gx_canvas_circle_draw.c
index 971323ef..c018a8db 100644
--- a/common/src/gx_canvas_circle_draw.c
+++ b/common/src/gx_canvas_circle_draw.c
@@ -158,6 +158,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
         }
 
         /* we have a view into which we can draw the line, do it */
+        GX_RECTANGLE *original_clip = context->gx_draw_context_clip;
         context -> gx_draw_context_clip = &clip_rect;
 
         if (brush -> gx_brush_style & (GX_BRUSH_SOLID_FILL | GX_BRUSH_PIXELMAP_FILL))
@@ -171,6 +172,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
         }
 
         view = view -> gx_view_next;
+        context -> gx_draw_context_clip = original_clip;
     }
 
     /* Return successful completion.  */
diff --git a/common/src/gx_canvas_ellipse_draw.c b/common/src/gx_canvas_ellipse_draw.c
index 3edf12b1..df18be70 100644
--- a/common/src/gx_canvas_ellipse_draw.c
+++ b/common/src/gx_canvas_ellipse_draw.c
@@ -158,6 +158,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
         }
 
         /* we have a view into which we can draw the line, do it */
+        GX_RECTANGLE *original_clip = context->gx_draw_context_clip;
         context -> gx_draw_context_clip = &clip_rect;
 
         if ((brush -> gx_brush_style & (GX_BRUSH_SOLID_FILL | GX_BRUSH_PIXELMAP_FILL)) &&
@@ -173,6 +174,7 @@ VOID             (*outline_function)(GX_DRAW_CONTEXT *context, INT xcenter, INT
         }
 
         view = view -> gx_view_next;
+        context -> gx_draw_context_clip = original_clip;
     }
 
     /* Return successful completion.  */
diff --git a/common/src/gx_canvas_polygon_draw.c b/common/src/gx_canvas_polygon_draw.c
index 9e727e20..30c73375 100644
--- a/common/src/gx_canvas_polygon_draw.c
+++ b/common/src/gx_canvas_polygon_draw.c
@@ -142,6 +142,7 @@ GX_VALUE         width;
         }
 
         /* we have a view into which we can draw the polygon, do it */
+        GX_RECTANGLE *original_clip = context->gx_draw_context_clip;
         context -> gx_draw_context_clip = &clip_rect;
 
         if (context -> gx_draw_context_brush.gx_brush_style & (GX_BRUSH_SOLID_FILL | GX_BRUSH_PIXELMAP_FILL))
@@ -156,6 +157,8 @@ GX_VALUE         width;
         }
 
         view = view -> gx_view_next;
+        context -> gx_draw_context_clip = original_clip;
+
     }
 
     /* Return successful completion.  */
diff --git a/common/src/gx_display_driver_4444argb_horizontal_pixelmap_line_draw.c b/common/src/gx_display_driver_4444argb_horizontal_pixelmap_line_draw.c
index 452e8dea..ffab043a 100644
--- a/common/src/gx_display_driver_4444argb_horizontal_pixelmap_line_draw.c
+++ b/common/src/gx_display_driver_4444argb_horizontal_pixelmap_line_draw.c
@@ -1,10 +1,10 @@
 /***************************************************************************
- * Copyright (c) 2024 Microsoft Corporation 
- * 
+ * Copyright (c) 2024 Microsoft Corporation
+ *
  * This program and the accompanying materials are made available under the
  * terms of the MIT License which is available at
  * https://opensource.org/licenses/MIT.
- * 
+ *
  * SPDX-License-Identifier: MIT
  **************************************************************************/
 
@@ -26,7 +26,6 @@
 #include "gx_api.h"
 #include "gx_display.h"
 #include "gx_context.h"
-#if defined(GX_ARC_DRAWING_SUPPORT)
 
 #if defined(GX_BRUSH_ALPHA_SUPPORT)
 /**************************************************************************/
@@ -1116,6 +1115,3 @@ GX_UBYTE alpha;
         info -> current_aux_ptr = (GX_UBYTE *)info -> pixelmap -> gx_pixelmap_aux_data;
     }
 }
-
-#endif /* GX_ARC_DRAWING_SUPPORT */
-
diff --git a/common/src/gx_display_driver_565rgb_horizontal_pixelmap_line_draw.c b/common/src/gx_display_driver_565rgb_horizontal_pixelmap_line_draw.c
index 56415d77..acaf7db1 100644
--- a/common/src/gx_display_driver_565rgb_horizontal_pixelmap_line_draw.c
+++ b/common/src/gx_display_driver_565rgb_horizontal_pixelmap_line_draw.c
@@ -1,10 +1,10 @@
 /***************************************************************************
- * Copyright (c) 2024 Microsoft Corporation 
- * 
+ * Copyright (c) 2024 Microsoft Corporation
+ *
  * This program and the accompanying materials are made available under the
  * terms of the MIT License which is available at
  * https://opensource.org/licenses/MIT.
- * 
+ *
  * SPDX-License-Identifier: MIT
  **************************************************************************/
 
@@ -27,8 +27,6 @@
 #include "gx_display.h"
 #include "gx_context.h"
 
-#if defined(GX_ARC_DRAWING_SUPPORT)
-
 #if defined(GX_BRUSH_ALPHA_SUPPORT)
 
 /**************************************************************************/
@@ -1164,5 +1162,3 @@ GX_UBYTE alpha;
         info -> current_aux_ptr = (GX_UBYTE *)info ->  pixelmap -> gx_pixelmap_aux_data;
     }
 }
-#endif /*GX_ARC_DRAWING_SUPPORT*/
-
diff --git a/common/src/gx_display_driver_565rgb_rotated_horizontal_pixelmap_line_draw.c b/common/src/gx_display_driver_565rgb_rotated_horizontal_pixelmap_line_draw.c
index 017bc270..006e9700 100644
--- a/common/src/gx_display_driver_565rgb_rotated_horizontal_pixelmap_line_draw.c
+++ b/common/src/gx_display_driver_565rgb_rotated_horizontal_pixelmap_line_draw.c
@@ -1,10 +1,10 @@
 /***************************************************************************
- * Copyright (c) 2024 Microsoft Corporation 
- * 
+ * Copyright (c) 2024 Microsoft Corporation
+ *
  * This program and the accompanying materials are made available under the
  * terms of the MIT License which is available at
  * https://opensource.org/licenses/MIT.
- * 
+ *
  * SPDX-License-Identifier: MIT
  **************************************************************************/
 
@@ -27,8 +27,6 @@
 #include "gx_display.h"
 #include "gx_context.h"
 
-#if defined(GX_ARC_DRAWING_SUPPORT)
-
 #if defined(GX_BRUSH_ALPHA_SUPPORT)
 
 /**************************************************************************/
@@ -1131,5 +1129,3 @@ GX_UBYTE alpha;
         info -> current_aux_ptr = (GX_UBYTE *)info -> pixelmap -> gx_pixelmap_aux_data;
     }
 }
-#endif /*GX_ARC_DRAWING_SUPPORT*/
-
diff --git a/test/guix_test/cmake/regression/CMakeLists.txt b/test/guix_test/cmake/regression/CMakeLists.txt
index fa779550..54b45aa7 100644
--- a/test/guix_test/cmake/regression/CMakeLists.txt
+++ b/test/guix_test/cmake/regression/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 cmake_policy(SET CMP0057 NEW)
 
 project(regression_test LANGUAGES C)