diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 835966f8..87aaa450 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -76,6 +76,8 @@ jobs:
             platform-name: arduino:renesas_uno
           - fqbn: arduino:esp32:nano_nora
             platform-name: arduino:esp32
+          - fqbn: arduino:mbed_edge:edge_control
+            platform-name: arduino:mbed_edge
 
         # Make board type-specific customizations to the matrix jobs
         include:
diff --git a/library.properties b/library.properties
index fdf2b9b4..bcd31936 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Arduino Library for network connection management (WiFi, GSM, NB, [Ethe
 paragraph=Originally part of ArduinoIoTCloud
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_ConnectionHandler
-architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta,mbed_giga,renesas_portenta,renesas_uno
+architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta,mbed_giga,renesas_portenta,renesas_uno,mbed_edge
 depends=Arduino_DebugUtils, WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN
diff --git a/src/Arduino_CatM1ConnectionHandler.cpp b/src/Arduino_CatM1ConnectionHandler.cpp
index 59d47fe9..9843a09e 100644
--- a/src/Arduino_CatM1ConnectionHandler.cpp
+++ b/src/Arduino_CatM1ConnectionHandler.cpp
@@ -54,6 +54,10 @@ unsigned long CatM1ConnectionHandler::getTime()
 
 NetworkConnectionState CatM1ConnectionHandler::update_handleInit()
 {
+#if defined (ARDUINO_EDGE_CONTROL)
+  pinMode(ON_MKR2, OUTPUT);
+  digitalWrite(ON_MKR2, HIGH);
+#endif
   return NetworkConnectionState::CONNECTING;
 }
 
diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index dc97ca77..37f99fe0 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -168,6 +168,13 @@
   #define WIFI_FIRMWARE_VERSION_REQUIRED WIFI_FIRMWARE_LATEST_VERSION
 #endif
 
+#ifdef ARDUINO_EDGE_CONTROL
+  #include <GSM.h>
+  #define BOARD_HAS_CATM1_NBIOT
+  #define BOARD_HAS_PORTENTA_CATM1_NBIOT_SHIELD
+  #define NETWORK_HARDWARE_ERROR
+#endif
+
 /******************************************************************************
    TYPEDEFS
  ******************************************************************************/
diff --git a/src/Arduino_WiFiConnectionHandler.h b/src/Arduino_WiFiConnectionHandler.h
index 56670793..bf16fa06 100644
--- a/src/Arduino_WiFiConnectionHandler.h
+++ b/src/Arduino_WiFiConnectionHandler.h
@@ -38,7 +38,7 @@ class WiFiConnectionHandler : public ConnectionHandler
 
 
     virtual unsigned long getTime() override;
-    virtual Client & getClient() override{ return _wifi_client; }
+    virtual Client & getClient() override { return _wifi_client; }
     virtual UDP & getUDP() override { return _wifi_udp; }