diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 744a6d2e..5c30659f 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -24,5 +24,5 @@ jobs:
           check_hidden: true
           # In the event of a false positive, add the word in all lower case to this file:
           # ignore_words_file: ./extras/codespell-ignore-words-list.txt
-          skip: src/utility/STM32Cube_FW
+          skip: src/utility/STM32_WPAN
           path: src
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index da41142d..86c4254f 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -14,9 +14,10 @@ jobs:
           - STMicroelectronics:stm32:Nucleo_64:pnum=NUCLEO_L476RG
           - STMicroelectronics:stm32:Disco:pnum=B_L475E_IOT01A
           - STMicroelectronics:stm32:Nucleo_64:pnum=P_NUCLEO_WB55RG
+          - STMicroelectronics:stm32:Nucleo_64:pnum=P_NUCLEO_WB55_USB_DONGLE
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
       - uses: arduino/compile-sketches@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
index 08db7aca..f3441596 100644
--- a/examples/Central/LedControl/LedControl.ino
+++ b/examples/Central/LedControl/LedControl.ino
@@ -57,7 +57,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
index 44aa00c4..ad78946c 100644
--- a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
+++ b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
@@ -51,7 +51,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino
index 4c34e563..fbbb7a9e 100644
--- a/examples/Central/Scan/Scan.ino
+++ b/examples/Central/Scan/Scan.ino
@@ -47,7 +47,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino
index bba10789..6ee70e17 100644
--- a/examples/Central/ScanCallback/ScanCallback.ino
+++ b/examples/Central/ScanCallback/ScanCallback.ino
@@ -49,7 +49,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino
index b371617f..6199933b 100644
--- a/examples/Central/SensorTagButton/SensorTagButton.ino
+++ b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -51,7 +51,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
index fb186766..59e19451 100644
--- a/examples/Peripheral/ButtonLED/ButtonLED.ino
+++ b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -58,7 +58,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Peripheral/CallbackLED/CallbackLED.ino b/examples/Peripheral/CallbackLED/CallbackLED.ino
index 0326f732..0a94d092 100644
--- a/examples/Peripheral/CallbackLED/CallbackLED.ino
+++ b/examples/Peripheral/CallbackLED/CallbackLED.ino
@@ -52,7 +52,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/examples/Peripheral/LED/LED.ino b/examples/Peripheral/LED/LED.ino
index 1ba9c9a8..442350d0 100644
--- a/examples/Peripheral/LED/LED.ino
+++ b/examples/Peripheral/LED/LED.ino
@@ -50,7 +50,7 @@ BLELocalDevice BLEObj(&HCISpiTransport);
 BLELocalDevice& BLE = BLEObj;
 #endif
 #elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
-      defined(ARDUINO_STM32WB5MM_DK) || defined(P_NUCLEO_WB55_USB_DONGLE)
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
 HCISharedMemTransportClass HCISharedMemTransport;
 #if !defined(FAKE_BLELOCALDEVICE)
 BLELocalDevice BLEObj(&HCISharedMemTransport);
diff --git a/extras/STM32Cube_FW/0001-chore-adapt-STM32Cube_FW-sources.patch b/extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
similarity index 57%
rename from extras/STM32Cube_FW/0001-chore-adapt-STM32Cube_FW-sources.patch
rename to extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
index 48a28137..90daace9 100644
--- a/extras/STM32Cube_FW/0001-chore-adapt-STM32Cube_FW-sources.patch
+++ b/extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
@@ -1,24 +1,23 @@
-From 542e007fa5a1b53664d2efb5f01d67767123a357 Mon Sep 17 00:00:00 2001
+From 5587ff466e0276de186103d21e6a4e498820e49f Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
-Date: Thu, 13 Jul 2023 17:08:05 +0200
-Subject: [PATCH 1/4] chore: adapt STM32Cube_FW sources
+Date: Wed, 10 Jan 2024 18:16:01 +0100
+Subject: [PATCH 1/4] chore: adapt STM32_WPAN sources
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
- src/utility/STM32Cube_FW/app_conf_default.h | 46 ++++++++++++++++-----
- src/utility/STM32Cube_FW/ble_bufsize.h      |  7 ++++
- src/utility/STM32Cube_FW/hw.h               | 13 +++++-
- src/utility/STM32Cube_FW/hw_ipcc.c          |  5 ++-
- src/utility/STM32Cube_FW/shci.c             |  3 +-
- src/utility/STM32Cube_FW/shci_tl.c          | 18 +++++++-
- src/utility/STM32Cube_FW/stm_list.c         |  7 +++-
- src/utility/STM32Cube_FW/tl_mbox.c          |  7 +++-
- 8 files changed, 86 insertions(+), 20 deletions(-)
+ src/utility/STM32_WPAN/app_conf_default.h | 49 +++++++++++++++++++----
+ src/utility/STM32_WPAN/hw.h               | 13 +++++-
+ src/utility/STM32_WPAN/hw_ipcc.c          |  4 +-
+ src/utility/STM32_WPAN/shci.c             |  2 +
+ src/utility/STM32_WPAN/shci_tl.c          | 17 ++++++++
+ src/utility/STM32_WPAN/stm_list.c         |  6 ++-
+ src/utility/STM32_WPAN/tl_mbox.c          |  6 +++
+ 7 files changed, 85 insertions(+), 12 deletions(-)
 
-diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
-index 51bd33a..1c6dd91 100644
---- a/src/utility/STM32Cube_FW/app_conf_default.h
-+++ b/src/utility/STM32Cube_FW/app_conf_default.h
+diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
+index 846be3c..6c9beb3 100644
+--- a/src/utility/STM32_WPAN/app_conf_default.h
++++ b/src/utility/STM32_WPAN/app_conf_default.h
 @@ -1,9 +1,9 @@
  /* USER CODE BEGIN Header */
  /**
@@ -31,22 +30,22 @@ index 51bd33a..1c6dd91 100644
    ******************************************************************************
    * @attention
    *
-@@ -19,18 +19,38 @@
+@@ -19,18 +19,40 @@
  /* USER CODE END Header */
  
  /* Define to prevent recursive inclusion -------------------------------------*/
 -#ifndef APP_CONF_H
 -#define APP_CONF_H
--
 +#ifndef APP_CONF_DEFAULT_H
 +#define APP_CONF_DEFAULT_H
+ 
 +#if 0
  #include "hw.h"
  #include "hw_conf.h"
  #include "hw_if.h"
  #include "ble_bufsize.h"
--
 +#endif
+ 
  /******************************************************************************
   * Application Config
   ******************************************************************************/
@@ -74,79 +73,68 @@ index 51bd33a..1c6dd91 100644
  /**
   * Define Secure Connections Support
   */
-@@ -104,7 +124,7 @@
+@@ -104,6 +126,7 @@
  #define CFG_FW_SUBVERSION         (1)
  #define CFG_FW_BRANCH             (0)
  #define CFG_FW_BUILD              (0)
--
 +#endif
+ 
  /******************************************************************************
   * BLE Stack
-  ******************************************************************************/
-@@ -152,13 +172,15 @@
-  * Prepare Write List size in terms of number of packet
-  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
-  */
--#define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
-+// #define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
-+#define CFG_BLE_PREPARE_WRITE_LIST_SIZE         (0x3A)
- 
- /**
-  * Number of allocated memory blocks
-  * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
-  */
--#define CFG_BLE_MBLOCK_COUNT            (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK))
-+//#define CFG_BLE_MBLOCK_COUNT            (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK))
-+#define CFG_BLE_MBLOCK_COUNT              (0x79)
- 
- /**
-  * Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
-@@ -250,7 +272,7 @@
+@@ -250,7 +273,7 @@
   *          0: LE Power Class 2-3
   * other bits: complete with Options_extension flag
   */
 -#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
-+#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY)
++#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
  
  /**
   * BLE stack Options_extension flags to be configured with:
-@@ -323,6 +345,7 @@
+@@ -292,7 +315,11 @@
+  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+  */
  
- #define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_3)
+-#define CFG_BLE_MAX_ADV_SET_NBR     (8)
++#if defined(STM32WB15xx)
++  #define CFG_BLE_MAX_ADV_SET_NBR     (3)
++#else
++  #define CFG_BLE_MAX_ADV_SET_NBR     (8)
++#endif
+ 
+  /* Maximum advertising data length (in bytes)
+  * Range: 31 .. 1650 with limitation:
+@@ -301,7 +328,11 @@
+  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+  */
+ 
+-#define CFG_BLE_MAX_ADV_DATA_LEN    (207)
++#if defined(STM32WB15xx)
++  #define CFG_BLE_MAX_ADV_DATA_LEN    (414)
++#else
++  #define CFG_BLE_MAX_ADV_DATA_LEN    (207)
++#endif
+ 
+  /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+   * Range: -1280 .. 1280
+@@ -324,6 +355,7 @@
+ 
+ #define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
  
 +#if 0
  /******************************************************************************
   * Transport Layer
   ******************************************************************************/
-@@ -658,4 +681,5 @@ typedef enum
+@@ -659,4 +691,5 @@ typedef enum
  
  #define CFG_OTP_END_ADRESS      OTP_AREA_END_ADDR
  
 -#endif /*APP_CONF_H */
 +#endif
 +#endif /*APP_CONF_DEFAULT_H */
-diff --git a/src/utility/STM32Cube_FW/ble_bufsize.h b/src/utility/STM32Cube_FW/ble_bufsize.h
-index b9935c0..d4d2890 100644
---- a/src/utility/STM32Cube_FW/ble_bufsize.h
-+++ b/src/utility/STM32Cube_FW/ble_bufsize.h
-@@ -75,6 +75,13 @@
-           ((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
-                       BLE_MBLOCKS_SECURE_CONNECTIONS))
- 
-+/*
-+ * BLE_DEFAULT_MBLOCKS_COUNT: default memory blocks count
-+ */
-+#define BLE_DEFAULT_MBLOCKS_COUNT(n_link) \
-+          BLE_MBLOCKS_CALC(BLE_DEFAULT_PREP_WRITE_LIST_SIZE, \
-+                           BLE_DEFAULT_MAX_ATT_MTU, n_link)
-+
- /*
-  * BLE_FIXED_BUFFER_SIZE_BYTES:
-  * A part of the RAM, is dynamically allocated by initializing all the pointers
-diff --git a/src/utility/STM32Cube_FW/hw.h b/src/utility/STM32Cube_FW/hw.h
+diff --git a/src/utility/STM32_WPAN/hw.h b/src/utility/STM32_WPAN/hw.h
 index 651e1f1..1472a5e 100644
---- a/src/utility/STM32Cube_FW/hw.h
-+++ b/src/utility/STM32Cube_FW/hw.h
+--- a/src/utility/STM32_WPAN/hw.h
++++ b/src/utility/STM32_WPAN/hw.h
 @@ -26,14 +26,23 @@ extern "C" {
  #endif
  
@@ -173,15 +161,14 @@ index 651e1f1..1472a5e 100644
  
    void HW_IPCC_BLE_Init( void );
    void HW_IPCC_BLE_SendCmd( void );
-diff --git a/src/utility/STM32Cube_FW/hw_ipcc.c b/src/utility/STM32Cube_FW/hw_ipcc.c
-index fd620b8..c730482 100644
---- a/src/utility/STM32Cube_FW/hw_ipcc.c
-+++ b/src/utility/STM32Cube_FW/hw_ipcc.c
-@@ -17,9 +17,9 @@
-   ******************************************************************************
+diff --git a/src/utility/STM32_WPAN/hw_ipcc.c b/src/utility/STM32_WPAN/hw_ipcc.c
+index fd620b8..3461cbe 100644
+--- a/src/utility/STM32_WPAN/hw_ipcc.c
++++ b/src/utility/STM32_WPAN/hw_ipcc.c
+@@ -18,8 +18,9 @@
    */
  /* USER CODE END Header */
--
+ 
 +#if defined(STM32WBxx)
  /* Includes ------------------------------------------------------------------*/
 -#include "app_common.h"
@@ -189,38 +176,36 @@ index fd620b8..c730482 100644
  #include "mbox_def.h"
  
  /* Global variables ---------------------------------------------------------*/
-@@ -667,3 +667,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )
+@@ -667,3 +668,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )
  }
  
  __weak void HW_IPCC_TRACES_EvtNot( void ){};
 +#endif /* STM32WBxx */
-diff --git a/src/utility/STM32Cube_FW/shci.c b/src/utility/STM32Cube_FW/shci.c
-index eaa35d7..4525656 100644
---- a/src/utility/STM32Cube_FW/shci.c
-+++ b/src/utility/STM32Cube_FW/shci.c
-@@ -16,7 +16,7 @@
-  ******************************************************************************
+diff --git a/src/utility/STM32_WPAN/shci.c b/src/utility/STM32_WPAN/shci.c
+index 5c32555..40110f4 100644
+--- a/src/utility/STM32_WPAN/shci.c
++++ b/src/utility/STM32_WPAN/shci.c
+@@ -17,6 +17,7 @@
   */
  
--
+ 
 +#if defined(STM32WBxx)
  /* Includes ------------------------------------------------------------------*/
  #include "stm32_wpan_common.h"
  
-@@ -739,3 +739,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
+@@ -759,3 +760,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
  
    return (SHCI_Success);
  }
 +#endif /* STM32WBxx */
-diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32Cube_FW/shci_tl.c
-index 0f60430..e343809 100644
---- a/src/utility/STM32Cube_FW/shci_tl.c
-+++ b/src/utility/STM32Cube_FW/shci_tl.c
-@@ -16,12 +16,13 @@
-  ******************************************************************************
+diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
+index 0f60430..daa988c 100644
+--- a/src/utility/STM32_WPAN/shci_tl.c
++++ b/src/utility/STM32_WPAN/shci_tl.c
+@@ -17,11 +17,13 @@
   */
  
--
+ 
 +#if defined(STM32WBxx)
  /* Includes ------------------------------------------------------------------*/
  #include "stm32_wpan_common.h"
@@ -231,7 +216,7 @@ index 0f60430..e343809 100644
  
  /* Private typedef -----------------------------------------------------------*/
  typedef enum
-@@ -168,6 +169,20 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl
+@@ -168,6 +170,20 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl
    return;
  }
  
@@ -252,20 +237,19 @@ index 0f60430..e343809 100644
  /* Private functions ---------------------------------------------------------*/
  static void TlInit( TL_CmdPacket_t * p_cmdbuffer )
  {
-@@ -250,3 +265,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)
+@@ -250,3 +266,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)
  
    return;
  }
 +#endif /* STM32WBxx */
-diff --git a/src/utility/STM32Cube_FW/stm_list.c b/src/utility/STM32Cube_FW/stm_list.c
-index 4c92864..4e8c364 100644
---- a/src/utility/STM32Cube_FW/stm_list.c
-+++ b/src/utility/STM32Cube_FW/stm_list.c
-@@ -16,11 +16,13 @@
-   ******************************************************************************
+diff --git a/src/utility/STM32_WPAN/stm_list.c b/src/utility/STM32_WPAN/stm_list.c
+index 4c92864..df6c215 100644
+--- a/src/utility/STM32_WPAN/stm_list.c
++++ b/src/utility/STM32_WPAN/stm_list.c
+@@ -17,10 +17,13 @@
    */
  
--
+ 
 +#if defined(STM32WBxx)
  /******************************************************************************
   * Include Files
@@ -277,15 +261,15 @@ index 4c92864..4e8c364 100644
  
  #include "stm_list.h"
  
-@@ -204,3 +206,4 @@ void LST_get_prev_node (tListNode * ref_node, tListNode ** node)
+@@ -204,3 +207,4 @@ void LST_get_prev_node (tListNode * ref_node, tListNode ** node)
  
    __set_PRIMASK(primask_bit);      /**< Restore PRIMASK bit*/
  }
 +#endif /* STM32WBxx */
-diff --git a/src/utility/STM32Cube_FW/tl_mbox.c b/src/utility/STM32Cube_FW/tl_mbox.c
-index 27a998a..1139316 100644
---- a/src/utility/STM32Cube_FW/tl_mbox.c
-+++ b/src/utility/STM32Cube_FW/tl_mbox.c
+diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
+index 27a998a..40c9679 100644
+--- a/src/utility/STM32_WPAN/tl_mbox.c
++++ b/src/utility/STM32_WPAN/tl_mbox.c
 @@ -16,6 +16,7 @@
   ******************************************************************************
   */
@@ -294,19 +278,18 @@ index 27a998a..1139316 100644
  /* Includes ------------------------------------------------------------------*/
  #include "stm32_wpan_common.h"
  #include "hw.h"
-@@ -51,9 +52,10 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
+@@ -51,8 +52,10 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_SysTable_t TL_SysTable;
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_MemManagerTable_t TL_MemManagerTable;
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
 +#if 0
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_Mac_802_15_4_t TL_Mac_802_15_4_Table;
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ZigbeeTable_t TL_Zigbee_Table;
--
 +#endif
+ 
  /**< tables */
  PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  FreeBufQueue;
- PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  TracesEvtQueue;
-@@ -97,8 +99,10 @@ void TL_Init( void )
+@@ -97,8 +100,10 @@ void TL_Init( void )
    TL_RefTable.p_sys_table = &TL_SysTable;
    TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
    TL_RefTable.p_traces_table = &TL_TracesTable;
@@ -317,11 +300,11 @@ index 27a998a..1139316 100644
    HW_IPCC_Init();
  
    return;
-@@ -846,3 +850,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
+@@ -846,3 +851,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
  
    return;
  }
 +#endif /* STM32WBxx */
 -- 
-2.38.0.windows.1
+2.34.1
 
diff --git a/extras/STM32Cube_FW/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch b/extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
similarity index 68%
rename from extras/STM32Cube_FW/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
rename to extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
index 07ce6e6e..e234d198 100644
--- a/extras/STM32Cube_FW/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
+++ b/extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
@@ -1,18 +1,18 @@
-From 5d07a0e5c0463965f8cf8dde6076b5cf2c779e90 Mon Sep 17 00:00:00 2001
+From 2867f96057d7bd5b34cfc3395d78653856f9cc7c Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Thu, 13 Jul 2023 17:16:40 +0200
 Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
- src/utility/STM32Cube_FW/shci_tl.c | 10 ++++++----
+ src/utility/STM32_WPAN/shci_tl.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32Cube_FW/shci_tl.c
-index e343809..6038025 100644
---- a/src/utility/STM32Cube_FW/shci_tl.c
-+++ b/src/utility/STM32Cube_FW/shci_tl.c
-@@ -23,6 +23,7 @@
+diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
+index daa988c..25e1a21 100644
+--- a/src/utility/STM32_WPAN/shci_tl.c
++++ b/src/utility/STM32_WPAN/shci_tl.c
+@@ -24,6 +24,7 @@
  #include "stm_list.h"
  #include "shci_tl.h"
  #include "stm32_def.h"
@@ -20,7 +20,7 @@ index e343809..6038025 100644
  
  /* Private typedef -----------------------------------------------------------*/
  typedef enum
-@@ -250,10 +251,11 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
+@@ -251,10 +252,11 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
  /* Weak implementation ----------------------------------------------------------------*/
  __WEAK void shci_cmd_resp_wait(uint32_t timeout)
  {
@@ -37,5 +37,5 @@ index e343809..6038025 100644
  }
  
 -- 
-2.38.0.windows.1
+2.34.1
 
diff --git a/extras/STM32Cube_FW/0003-chore-add-support-for-customize-app_conf_default.h.patch b/extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
similarity index 50%
rename from extras/STM32Cube_FW/0003-chore-add-support-for-customize-app_conf_default.h.patch
rename to extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
index e23d54c8..bd66679d 100644
--- a/extras/STM32Cube_FW/0003-chore-add-support-for-customize-app_conf_default.h.patch
+++ b/extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
@@ -1,29 +1,29 @@
-From 370e1082edae9b69d50f824db85b5cbe3b786e79 Mon Sep 17 00:00:00 2001
+From ba3df1bd28eb49eab28a99fa88481f45fe565cbf Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
-Date: Mon, 12 Dec 2022 17:29:27 +0100
+Date: Wed, 10 Jan 2024 18:45:17 +0100
 Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
- src/utility/STM32Cube_FW/app_conf_default.h | 86 ++++++++++++++++-----
- 1 file changed, 68 insertions(+), 18 deletions(-)
+ src/utility/STM32_WPAN/app_conf_default.h | 58 ++++++++++++++++++-----
+ 1 file changed, 45 insertions(+), 13 deletions(-)
 
-diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
-index 1c6dd91..d39492e 100644
---- a/src/utility/STM32Cube_FW/app_conf_default.h
-+++ b/src/utility/STM32Cube_FW/app_conf_default.h
-@@ -48,7 +48,9 @@
+diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
+index 6c9beb3..9509a0f 100644
+--- a/src/utility/STM32_WPAN/app_conf_default.h
++++ b/src/utility/STM32_WPAN/app_conf_default.h
+@@ -50,7 +50,9 @@
  /**
   * Define Tx Power
   */
 -#define CFG_TX_POWER                      (0x18) /* -0.15dBm */
 +#ifndef CFG_TX_POWER
-+  #define CFG_TX_POWER                      (0x18) /* -0.15dBm */
++  #define CFG_TX_POWER                        (0x18) /* -0.15dBm */
 +#endif
  
  #if 0
  /**
-@@ -132,13 +134,25 @@
+@@ -135,13 +137,25 @@
   * Maximum number of simultaneous connections that the device will support.
   * Valid values are from 1 to 8
   */
@@ -51,56 +51,22 @@ index 1c6dd91..d39492e 100644
  
  /**
   * Maximum number of Attributes
-@@ -147,13 +161,21 @@
+@@ -150,7 +164,13 @@
   * Note that certain characteristics and relative descriptors are added automatically during device initialization
   * so this parameters should be 9 plus the number of user Attributes
   */
 -#define CFG_BLE_NUM_GATT_ATTRIBUTES 68
 +#ifndef CFG_BLE_NUM_GATT_ATTRIBUTES
 +#ifdef STM32WB15xx
-+  #define CFG_BLE_NUM_GATT_ATTRIBUTES   30
++  #define CFG_BLE_NUM_GATT_ATTRIBUTES 30
 +#else
-+  #define CFG_BLE_NUM_GATT_ATTRIBUTES   68
++  #define CFG_BLE_NUM_GATT_ATTRIBUTES 68
 +#endif
 +#endif
  
  /**
   * Maximum supported ATT_MTU size
-  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
-  */
--#define CFG_BLE_MAX_ATT_MTU             (156)
-+#ifndef CFG_BLE_MAX_ATT_MTU
-+  #define CFG_BLE_MAX_ATT_MTU             (156)
-+#endif
- 
- /**
-  * Size of the storage area for Attribute values
-@@ -166,14 +188,22 @@
-  *  The total amount of memory needed is the sum of the above quantities for each attribute.
-  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
-  */
--#define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1344)
-+#ifndef CFG_BLE_ATT_VALUE_ARRAY_SIZE
-+#ifdef STM32WB15xx
-+  #define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1290)
-+#else
-+  #define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1344)
-+#endif
-+#endif
- 
- /**
-  * Prepare Write List size in terms of number of packet
-  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
-  */
- // #define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
--#define CFG_BLE_PREPARE_WRITE_LIST_SIZE         (0x3A)
-+#ifndef CFG_BLE_PREPARE_WRITE_LIST_SIZE
-+  #define CFG_BLE_PREPARE_WRITE_LIST_SIZE         (0x3A)
-+#endif
- 
- /**
-  * Number of allocated memory blocks
-@@ -185,12 +215,16 @@
+@@ -186,12 +206,16 @@
  /**
   * Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
   */
@@ -110,27 +76,27 @@ index 1c6dd91..d39492e 100644
 +#endif
  
  /**
-  * Sleep clock accuracy in Slave mode (ppm value)
+  * Sleep clock accuracy in Peripheral mode (ppm value)
   */
--#define CFG_BLE_SLAVE_SCA   500
-+#ifndef CFG_BLE_SLAVE_SCA
-+  #define CFG_BLE_SLAVE_SCA   500
+-#define CFG_BLE_PERIPHERAL_SCA   500
++#ifndef CFG_BLE_PERIPHERAL_SCA
++  #define CFG_BLE_PERIPHERAL_SCA   500
 +#endif
  
  /**
-  * Sleep clock accuracy in Master mode
-@@ -203,7 +237,9 @@
+  * Sleep clock accuracy in Central mode
+@@ -204,7 +228,9 @@
   * 6 : 21 ppm to 30 ppm
   * 7 : 0 ppm to 20 ppm
   */
--#define CFG_BLE_MASTER_SCA   0
-+#ifndef CFG_BLE_MASTER_SCA
-+  #define CFG_BLE_MASTER_SCA   0
+-#define CFG_BLE_CENTRAL_SCA   0
++#ifndef CFG_BLE_CENTRAL_SCA
++  #define CFG_BLE_CENTRAL_SCA   0
 +#endif
  
  /**
   * LsSource
-@@ -212,21 +248,27 @@
+@@ -213,21 +239,27 @@
   * - bit 1:   1: STM32WB5M Module device                             0: Other devices as STM32WBxx SOC, STM32WB1M module
   * - bit 2:   1: HSE/1024 Clock config                               0: LSE Clock config
   */
@@ -155,7 +121,7 @@ index 1c6dd91..d39492e 100644
 +#endif
  
  /**
-  * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us)
+  * Maximum duration of the connection event when the device is in Peripheral mode in units of 625/256 us (~2.44 us)
   */
 -#define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
 +#ifndef CFG_BLE_MAX_CONN_EVENT_LENGTH
@@ -164,32 +130,6 @@ index 1c6dd91..d39492e 100644
  
  /**
   * Viterbi Mode
-@@ -314,7 +356,11 @@
-  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
-  */
- 
--#define CFG_BLE_MAX_ADV_SET_NBR     (8)
-+#if defined(STM32WB15xx)
-+  #define CFG_BLE_MAX_ADV_SET_NBR     (3)
-+#else
-+  #define CFG_BLE_MAX_ADV_SET_NBR     (8)
-+#endif
- 
-  /* Maximum advertising data length (in bytes)
-  * Range: 31 .. 1650 with limitation:
-@@ -323,7 +369,11 @@
-  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
-  */
- 
--#define CFG_BLE_MAX_ADV_DATA_LEN    (207)
-+#if defined(STM32WB15xx)
-+  #define CFG_BLE_MAX_ADV_DATA_LEN    (414)
-+#else
-+  #define CFG_BLE_MAX_ADV_DATA_LEN    (207)
-+#endif
- 
-  /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
-   * Range: -1280 .. 1280
 -- 
-2.38.0.windows.1
+2.34.1
 
diff --git a/extras/STM32Cube_FW/0004-fix-TL_Evt_t-payload-size-for-reset.patch b/extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch
similarity index 70%
rename from extras/STM32Cube_FW/0004-fix-TL_Evt_t-payload-size-for-reset.patch
rename to extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch
index c239749f..035d4b99 100644
--- a/extras/STM32Cube_FW/0004-fix-TL_Evt_t-payload-size-for-reset.patch
+++ b/extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch
@@ -1,4 +1,4 @@
-From b294edcaee311c15dfb307ea1298ae88b16a92bf Mon Sep 17 00:00:00 2001
+From a6ae9acf134d326f74ff04818b4e2c643c826b35 Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Mon, 24 Jul 2023 10:55:20 +0200
 Subject: [PATCH 4/4] fix: TL_Evt_t payload size for reset
@@ -9,13 +9,13 @@ which require 4 bytes.
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
- src/utility/STM32Cube_FW/tl.h | 2 +-
+ src/utility/STM32_WPAN/tl.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/utility/STM32Cube_FW/tl.h b/src/utility/STM32Cube_FW/tl.h
+diff --git a/src/utility/STM32_WPAN/tl.h b/src/utility/STM32_WPAN/tl.h
 index 8e8c6cb..7452087 100644
---- a/src/utility/STM32Cube_FW/tl.h
-+++ b/src/utility/STM32Cube_FW/tl.h
+--- a/src/utility/STM32_WPAN/tl.h
++++ b/src/utility/STM32_WPAN/tl.h
 @@ -108,7 +108,7 @@ typedef PACKED_STRUCT
  {
    uint8_t   evtcode;
@@ -26,5 +26,5 @@ index 8e8c6cb..7452087 100644
  
  typedef PACKED_STRUCT
 -- 
-2.38.0.windows.1
+2.34.1
 
diff --git a/library.properties b/library.properties
index da5c1c4c..bebbdf56 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=STM32duinoBLE
-version=1.2.6
+version=1.2.7
 author=Arduino, SRA
 maintainer=stm32duino
 sentence=Fork of ArduinoBLE library to add the support of STM32WB, SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP and BLUENRG-M0 BLE modules.
diff --git a/patch0.patch b/patch0.patch
new file mode 100644
index 00000000..ae067cb6
--- /dev/null
+++ b/patch0.patch
@@ -0,0 +1,296 @@
+diff --git a/src/utility/STM32Cube_FW/README.md b/src/utility/STM32Cube_FW/README.md
+index 0d39a3e..97c4ceb 100644
+--- a/src/utility/STM32Cube_FW/README.md
++++ b/src/utility/STM32Cube_FW/README.md
+@@ -1,6 +1,6 @@
+ 
+ ## Source
+ 
+-[STMicroelectronics/STM32CubeWB Release v1.17.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.17.0)
+-- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.17.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
++[STMicroelectronics/STM32CubeWB Release v1.18.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.18.0)
++- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.18.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
+ 
+diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32Cube_FW/app_conf_default.h
+index 51bd33a..846be3c 100644
+--- a/src/utility/STM32Cube_FW/app_conf_default.h
++++ b/src/utility/STM32Cube_FW/app_conf_default.h
+@@ -61,14 +61,14 @@
+ #define CFG_GAP_DEVICE_NAME_LENGTH      (8)
+ 
+ /**
+-*   Identity root key used to derive LTK and CSRK
++*   Identity root key used to derive IRK and DHK(Legacy)
+ */
+-#define CFG_BLE_IRK     {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0}
++#define CFG_BLE_IR     {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0}
+ 
+ /**
+-* Encryption root key used to derive LTK and CSRK
++* Encryption root key used to derive LTK(Legacy) and CSRK
+ */
+-#define CFG_BLE_ERK     {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21}
++#define CFG_BLE_ER     {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21}
+ 
+ /**
+  * SMPS supply
+@@ -166,12 +166,12 @@
+ #define CFG_BLE_DATA_LENGTH_EXTENSION   1
+ 
+ /**
+- * Sleep clock accuracy in Slave mode (ppm value)
++ * Sleep clock accuracy in Peripheral mode (ppm value)
+  */
+-#define CFG_BLE_SLAVE_SCA   500
++#define CFG_BLE_PERIPHERAL_SCA   500
+ 
+ /**
+- * Sleep clock accuracy in Master mode
++ * Sleep clock accuracy in Central mode
+  * 0 : 251 ppm to 500 ppm
+  * 1 : 151 ppm to 250 ppm
+  * 2 : 101 ppm to 150 ppm
+@@ -181,7 +181,7 @@
+  * 6 : 21 ppm to 30 ppm
+  * 7 : 0 ppm to 20 ppm
+  */
+-#define CFG_BLE_MASTER_SCA   0
++#define CFG_BLE_CENTRAL_SCA   0
+ 
+ /**
+  * LsSource
+@@ -202,7 +202,7 @@
+ #define CFG_BLE_HSE_STARTUP_TIME  0x148
+ 
+ /**
+- * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us)
++ * Maximum duration of the connection event when the device is in Peripheral mode in units of 625/256 us (~2.44 us)
+  */
+ #define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
+ 
+@@ -318,10 +318,11 @@
+   /* BLE core version (16-bit signed integer).
+    * - SHCI_C2_BLE_INIT_BLE_CORE_5_2
+    * - SHCI_C2_BLE_INIT_BLE_CORE_5_3
+-   * which are used to set: 11(5.2), 12(5.3).
++   * - SHCI_C2_BLE_INIT_BLE_CORE_5_4
++   * which are used to set: 11(5.2), 12(5.3), 13(5.4).
+    */
+ 
+-#define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_3)
++#define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
+ 
+ /******************************************************************************
+  * Transport Layer
+@@ -486,13 +487,13 @@ typedef enum
+  * Debug
+  ******************************************************************************/
+ /**
+- * When set, this resets some hw resources to set the device in the same state than the power up
+- * The FW resets only register that may prevent the FW to run properly
++ * When set, this resets some hw resources to put the device in the same state as at power up.
++ * It resets only register that may prevent the FW to run properly.
+  *
+  * This shall be set to 0 in a final product
+  *
+  */
+-#define CFG_HW_RESET_BY_FW         1
++#define CFG_HW_RESET_BY_FW         0
+ 
+ /**
+  * keep debugger enabled while in any low power mode when set to 1
+diff --git a/src/utility/STM32Cube_FW/shci.c b/src/utility/STM32Cube_FW/shci.c
+index eaa35d7..5c32555 100644
+--- a/src/utility/STM32Cube_FW/shci.c
++++ b/src/utility/STM32Cube_FW/shci.c
+@@ -644,6 +644,26 @@ SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void )
+   return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+ }
+ 
++SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel )
++{
++  /**
++   * Buffer is large enough to hold command complete without payload
++   */
++  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
++  TL_EvtPacket_t * p_rsp;
++
++  p_rsp = (TL_EvtPacket_t *)local_buffer;
++
++  local_buffer[0] = (uint8_t)clockSel;
++
++  shci_send( SHCI_OPCODE_C2_SET_SYSTEM_CLOCK,
++             1,
++             local_buffer,
++             p_rsp );
++
++  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
++}
++
+ /**
+  *  Local System COMMAND
+  *  These commands are NOT sent to the CPU2
+diff --git a/src/utility/STM32Cube_FW/shci.h b/src/utility/STM32Cube_FW/shci.h
+index 750fa97..30ae10c 100644
+--- a/src/utility/STM32Cube_FW/shci.h
++++ b/src/utility/STM32Cube_FW/shci.h
+@@ -227,6 +227,7 @@ extern "C" {
+     SHCI_OCF_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME,
+     SHCI_OCF_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION,
+     SHCI_OCF_C2_802_15_4_DEINIT,
++    SHCI_OCF_C2_SET_SYSTEM_CLOCK,
+   } SHCI_OCF_t;
+ 
+ #define SHCI_OPCODE_C2_FUS_GET_STATE         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_GET_STATE)
+@@ -436,7 +437,7 @@ extern "C" {
+    * PrWriteListSize
+    * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
+    *
+-   * Maximum number of supported �prepare write request�
++   * Maximum number of supported "prepare write request"
+    *    - Min value: given by the macro DEFAULT_PREP_WRITE_LIST_SIZE
+    *    - Max value: a value higher than the minimum required can be specified, but it is not recommended
+    */
+@@ -464,20 +465,20 @@ extern "C" {
+   uint16_t AttMtu;
+ 
+   /**
+-   * SlaveSca
+-   * The sleep clock accuracy (ppm value) that used in BLE connected slave mode to calculate the window widening
++   * PeripheralSca
++   * The sleep clock accuracy (ppm value) that used in BLE connected Peripheral mode to calculate the window widening
+    * (in combination with the sleep clock accuracy sent by master in CONNECT_REQ PDU),
+    * refer to BLE 5.0 specifications - Vol 6 - Part B - chap 4.5.7 and 4.2.2
+    *     - Min value: 0
+    *     - Max value: 500 (worst possible admitted by specification)
+    */
+-  uint16_t SlaveSca;
++  uint16_t PeripheralSca;
+ 
+   /**
+-   * MasterSca
+-   * The sleep clock accuracy handled in master mode. It is used to determine the connection and advertising events timing.
++   * CentralSca
++   * The sleep clock accuracy handled in Central mode. It is used to determine the connection and advertising events timing.
+    * It is transmitted to the slave in CONNEC_REQ PDU used by the slave to calculate the window widening,
+-   * see SlaveSca and Bluetooth Core Specification v5.0 Vol 6 - Part B - chap 4.5.7 and 4.2.2
++   * see PeripheralSca and Bluetooth Core Specification v5.0 Vol 6 - Part B - chap 4.5.7 and 4.2.2
+    * Possible values:
+    *    - 251 ppm to 500 ppm: 0
+    *    - 151 ppm to 250 ppm: 1
+@@ -488,7 +489,7 @@ extern "C" {
+    *    - 21 ppm to 30 ppm: 6
+    *    - 0 ppm to 20 ppm: 7
+    */
+-  uint8_t MasterSca;
++  uint8_t CentralSca;
+ 
+   /**
+    * LsSource
+@@ -503,7 +504,7 @@ extern "C" {
+    * MaxConnEventLength
+    * This parameter determines the maximum duration of a slave connection event. When this duration is reached the slave closes
+    * the current connections event (whatever is the CE_length parameter specified by the master in HCI_CREATE_CONNECTION HCI command),
+-   * expressed in units of 625/256 �s (~2.44 �s)
++   * expressed in units of 625/256 us (~2.44 us)
+    *    - Min value: 0 (if 0 is specified, the master and slave perform only a single TX-RX exchange per connection event)
+    *    - Max value: 1638400 (4000 ms). A higher value can be specified (max 0xFFFFFFFF) but results in a maximum connection time
+    *      of 4000 ms as specified. In this case the parameter is not applied, and the predicted CE length calculated on slave is not shortened
+@@ -512,7 +513,7 @@ extern "C" {
+ 
+   /**
+    * HsStartupTime
+-   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 �s (~2.44 �s).
++   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us).
+    *    - Min value: 0
+    *    - Max value:  820 (~2 ms). A higher value can be specified, but the value that implemented in stack is forced to ~2 ms
+    */
+@@ -598,7 +599,7 @@ extern "C" {
+   int16_t rx_path_compens;
+ 
+   /* BLE core specification version (8-bit unsigned integer).
+-   * values as: 11(5.2), 12(5.3)
++   * values as: 11(5.2), 12(5.3), 13(5.4)
+    */
+   uint8_t ble_core_version;
+ 
+@@ -829,6 +830,7 @@ extern "C" {
+     /** No response parameters*/
+ 
+ #define SHCI_OPCODE_C2_CONFIG   (( SHCI_OGF << 10) + SHCI_OCF_C2_CONFIG)
++
+   /** Command parameters */
+     typedef PACKED_STRUCT{
+       uint8_t PayloadCmdSize;
+@@ -843,6 +845,15 @@ extern "C" {
+ 
+ #define SHCI_OPCODE_C2_802_15_4_DEINIT    (( SHCI_OGF << 10) + SHCI_OCF_C2_802_15_4_DEINIT)
+ 
++#define SHCI_OPCODE_C2_SET_SYSTEM_CLOCK   (( SHCI_OGF << 10) + SHCI_OCF_C2_SET_SYSTEM_CLOCK)
++  /** Command parameters */
++    typedef enum
++    {
++      SET_SYSTEM_CLOCK_HSE_TO_PLL,
++      SET_SYSTEM_CLOCK_PLL_ON_TO_HSE,
++      SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE,
++    }SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t;
++
+ /**
+  * PayloadCmdSize
+  * Value that shall be used
+@@ -859,8 +870,8 @@ extern "C" {
+ /**
+  * Device ID
+  */
+-#define SHCI_C2_CONFIG_STM32WB55xx                   (0x495)
+-#define SHCI_C2_CONFIG_STM32WB15xx                   (0x494)
++#define SHCI_C2_CONFIG_STM32WB55xx                    (0x495)
++#define SHCI_C2_CONFIG_STM32WB15xx                    (0x494)
+ 
+ /**
+  * Config1
+@@ -878,7 +889,7 @@ extern "C" {
+  */
+ #define SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE               (1<<0)
+ #define SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE        (1<<1)
+-#define SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE         (1<<2)
++#define SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE     (1<<2)
+ #define SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE           (1<<3)
+ #define SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE             (1<<4)
+ #define SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE           (1<<5)
+@@ -965,7 +976,8 @@ extern "C" {
+ #define INFO_STACK_TYPE_ZIGBEE_RFD                  0x31
+ #define INFO_STACK_TYPE_MAC                         0x40
+ #define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC       0x50
+-#define INFO_STACK_TYPE_BLE_THREAD_FTD_DYAMIC       0x51
++#define INFO_STACK_TYPE_BLE_THREAD_FTD_DYNAMIC      0x51
++#define INFO_STACK_TYPE_BLE_THREAD_LIGHT_DYNAMIC    0x52
+ #define INFO_STACK_TYPE_802154_LLD_TESTS            0x60
+ #define INFO_STACK_TYPE_802154_PHY_VALID            0x61
+ #define INFO_STACK_TYPE_BLE_PHY_VALID               0x62
+@@ -1364,9 +1376,24 @@ typedef struct {
+    */
+   SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void );
+ 
+-  #ifdef __cplusplus
++  /**
++  * SHCI_C2_SetSystemClock
++  * @brief Request CPU2 to change system clock
++  *
++  * @param clockSel: It can be one of the following list
++  *                -  SET_SYSTEM_CLOCK_HSE_TO_PLL : CPU2 set system clock to PLL, PLL must be configured and started before.
++  *                -  SET_SYSTEM_CLOCK_PLL_ON_TO_HSE : CPU2 set System clock to HSE, PLL is still ON after command execution.
++  *                -  SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE : CPU2 set System clock to HSE, PLL is turned OFF after command execution.
++  *
++  * @retval Status
++  */
++  SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel );
++
++
++#ifdef __cplusplus
+ }
+ #endif
+ 
+ #endif /*__SHCI_H */
+ 
++/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/src/utility/HCISharedMemTransport.cpp b/src/utility/HCISharedMemTransport.cpp
index 0db95041..412d0b06 100644
--- a/src/utility/HCISharedMemTransport.cpp
+++ b/src/utility/HCISharedMemTransport.cpp
@@ -19,7 +19,7 @@
 #if defined(STM32WBxx)
 
 #include "HCISharedMemTransport.h"
-#include "STM32Cube_FW/hw.h"
+#include "STM32_WPAN/hw.h"
 #include "otp.h"
 
 /* Private variables ---------------------------------------------------------*/
@@ -642,8 +642,8 @@ int HCISharedMemTransportClass::stm32wb_start_ble(void)
     CFG_BLE_PREPARE_WRITE_LIST_SIZE,
     CFG_BLE_MBLOCK_COUNT,
     CFG_BLE_MAX_ATT_MTU,
-    CFG_BLE_SLAVE_SCA,
-    CFG_BLE_MASTER_SCA,
+    CFG_BLE_PERIPHERAL_SCA,
+    CFG_BLE_CENTRAL_SCA,
     CFG_BLE_LS_SOURCE,
     CFG_BLE_MAX_CONN_EVENT_LENGTH,
     CFG_BLE_HSE_STARTUP_TIME,
diff --git a/src/utility/HCISharedMemTransport.h b/src/utility/HCISharedMemTransport.h
index 58fb871d..e739d63f 100644
--- a/src/utility/HCISharedMemTransport.h
+++ b/src/utility/HCISharedMemTransport.h
@@ -26,10 +26,10 @@
 #include "stm32wbxx_ll_rcc.h"
 #include "stm32wbxx_ll_ipcc.h"
 #include "stm32wbxx_ll_system.h"
-#include "STM32Cube_FW/tl.h"
-#include "STM32Cube_FW/shci.h"
-#include "STM32Cube_FW/shci_tl.h"
-#include "STM32Cube_FW/app_conf.h"
+#include "STM32_WPAN/tl.h"
+#include "STM32_WPAN/shci.h"
+#include "STM32_WPAN/shci_tl.h"
+#include "STM32_WPAN/app_conf.h"
 
 /* this one is for printing info content when HW serial enabled */
 //#define PRINT_IPCC_INFO
diff --git a/src/utility/STM32Cube_FW/README.md b/src/utility/STM32Cube_FW/README.md
deleted file mode 100644
index 0d39a3ef..00000000
--- a/src/utility/STM32Cube_FW/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-
-## Source
-
-[STMicroelectronics/STM32CubeWB Release v1.17.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.17.0)
-- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.17.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
-
diff --git a/src/utility/STM32Cube_FW/LICENSE.md b/src/utility/STM32_WPAN/LICENSE.md
similarity index 100%
rename from src/utility/STM32Cube_FW/LICENSE.md
rename to src/utility/STM32_WPAN/LICENSE.md
diff --git a/src/utility/STM32_WPAN/README.md b/src/utility/STM32_WPAN/README.md
new file mode 100644
index 00000000..97c4ceba
--- /dev/null
+++ b/src/utility/STM32_WPAN/README.md
@@ -0,0 +1,6 @@
+
+## Source
+
+[STMicroelectronics/STM32CubeWB Release v1.18.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.18.0)
+- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.18.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
+
diff --git a/src/utility/STM32Cube_FW/app_conf.h b/src/utility/STM32_WPAN/app_conf.h
similarity index 100%
rename from src/utility/STM32Cube_FW/app_conf.h
rename to src/utility/STM32_WPAN/app_conf.h
diff --git a/src/utility/STM32Cube_FW/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
similarity index 92%
rename from src/utility/STM32Cube_FW/app_conf_default.h
rename to src/utility/STM32_WPAN/app_conf_default.h
index d39492ea..9509a0f5 100644
--- a/src/utility/STM32Cube_FW/app_conf_default.h
+++ b/src/utility/STM32_WPAN/app_conf_default.h
@@ -21,12 +21,14 @@
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef APP_CONF_DEFAULT_H
 #define APP_CONF_DEFAULT_H
+
 #if 0
 #include "hw.h"
 #include "hw_conf.h"
 #include "hw_if.h"
 #include "ble_bufsize.h"
 #endif
+
 /******************************************************************************
  * Application Config
  ******************************************************************************/
@@ -49,7 +51,7 @@
  * Define Tx Power
  */
 #ifndef CFG_TX_POWER
-  #define CFG_TX_POWER                      (0x18) /* -0.15dBm */
+  #define CFG_TX_POWER                        (0x18) /* -0.15dBm */
 #endif
 
 #if 0
@@ -83,14 +85,14 @@
 #define CFG_GAP_DEVICE_NAME_LENGTH      (8)
 
 /**
-*   Identity root key used to derive LTK and CSRK
+*   Identity root key used to derive IRK and DHK(Legacy)
 */
-#define CFG_BLE_IRK     {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0}
+#define CFG_BLE_IR     {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0}
 
 /**
-* Encryption root key used to derive LTK and CSRK
+* Encryption root key used to derive LTK(Legacy) and CSRK
 */
-#define CFG_BLE_ERK     {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21}
+#define CFG_BLE_ER     {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21}
 
 /**
  * SMPS supply
@@ -127,6 +129,7 @@
 #define CFG_FW_BRANCH             (0)
 #define CFG_FW_BUILD              (0)
 #endif
+
 /******************************************************************************
  * BLE Stack
  ******************************************************************************/
@@ -163,9 +166,9 @@
  */
 #ifndef CFG_BLE_NUM_GATT_ATTRIBUTES
 #ifdef STM32WB15xx
-  #define CFG_BLE_NUM_GATT_ATTRIBUTES   30
+  #define CFG_BLE_NUM_GATT_ATTRIBUTES 30
 #else
-  #define CFG_BLE_NUM_GATT_ATTRIBUTES   68
+  #define CFG_BLE_NUM_GATT_ATTRIBUTES 68
 #endif
 #endif
 
@@ -173,9 +176,7 @@
  * Maximum supported ATT_MTU size
  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
  */
-#ifndef CFG_BLE_MAX_ATT_MTU
-  #define CFG_BLE_MAX_ATT_MTU             (156)
-#endif
+#define CFG_BLE_MAX_ATT_MTU             (156)
 
 /**
  * Size of the storage area for Attribute values
@@ -188,29 +189,19 @@
  *  The total amount of memory needed is the sum of the above quantities for each attribute.
  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
  */
-#ifndef CFG_BLE_ATT_VALUE_ARRAY_SIZE
-#ifdef STM32WB15xx
-  #define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1290)
-#else
-  #define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1344)
-#endif
-#endif
+#define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1344)
 
 /**
  * Prepare Write List size in terms of number of packet
  * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
  */
-// #define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
-#ifndef CFG_BLE_PREPARE_WRITE_LIST_SIZE
-  #define CFG_BLE_PREPARE_WRITE_LIST_SIZE         (0x3A)
-#endif
+#define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
 
 /**
  * Number of allocated memory blocks
  * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
  */
-//#define CFG_BLE_MBLOCK_COUNT            (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK))
-#define CFG_BLE_MBLOCK_COUNT              (0x79)
+#define CFG_BLE_MBLOCK_COUNT            (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK))
 
 /**
  * Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
@@ -220,14 +211,14 @@
 #endif
 
 /**
- * Sleep clock accuracy in Slave mode (ppm value)
+ * Sleep clock accuracy in Peripheral mode (ppm value)
  */
-#ifndef CFG_BLE_SLAVE_SCA
-  #define CFG_BLE_SLAVE_SCA   500
+#ifndef CFG_BLE_PERIPHERAL_SCA
+  #define CFG_BLE_PERIPHERAL_SCA   500
 #endif
 
 /**
- * Sleep clock accuracy in Master mode
+ * Sleep clock accuracy in Central mode
  * 0 : 251 ppm to 500 ppm
  * 1 : 151 ppm to 250 ppm
  * 2 : 101 ppm to 150 ppm
@@ -237,8 +228,8 @@
  * 6 : 21 ppm to 30 ppm
  * 7 : 0 ppm to 20 ppm
  */
-#ifndef CFG_BLE_MASTER_SCA
-  #define CFG_BLE_MASTER_SCA   0
+#ifndef CFG_BLE_CENTRAL_SCA
+  #define CFG_BLE_CENTRAL_SCA   0
 #endif
 
 /**
@@ -264,7 +255,7 @@
 #endif
 
 /**
- * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us)
+ * Maximum duration of the connection event when the device is in Peripheral mode in units of 625/256 us (~2.44 us)
  */
 #ifndef CFG_BLE_MAX_CONN_EVENT_LENGTH
   #define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
@@ -314,7 +305,7 @@
  *          0: LE Power Class 2-3
  * other bits: complete with Options_extension flag
  */
-#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY)
+#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
 
 /**
  * BLE stack Options_extension flags to be configured with:
@@ -390,10 +381,11 @@
   /* BLE core version (16-bit signed integer).
    * - SHCI_C2_BLE_INIT_BLE_CORE_5_2
    * - SHCI_C2_BLE_INIT_BLE_CORE_5_3
-   * which are used to set: 11(5.2), 12(5.3).
+   * - SHCI_C2_BLE_INIT_BLE_CORE_5_4
+   * which are used to set: 11(5.2), 12(5.3), 13(5.4).
    */
 
-#define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_3)
+#define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
 
 #if 0
 /******************************************************************************
@@ -559,13 +551,13 @@ typedef enum
  * Debug
  ******************************************************************************/
 /**
- * When set, this resets some hw resources to set the device in the same state than the power up
- * The FW resets only register that may prevent the FW to run properly
+ * When set, this resets some hw resources to put the device in the same state as at power up.
+ * It resets only register that may prevent the FW to run properly.
  *
  * This shall be set to 0 in a final product
  *
  */
-#define CFG_HW_RESET_BY_FW         1
+#define CFG_HW_RESET_BY_FW         0
 
 /**
  * keep debugger enabled while in any low power mode when set to 1
diff --git a/src/utility/STM32Cube_FW/ble_bufsize.h b/src/utility/STM32_WPAN/ble_bufsize.h
similarity index 96%
rename from src/utility/STM32Cube_FW/ble_bufsize.h
rename to src/utility/STM32_WPAN/ble_bufsize.h
index d4d28907..b9935c0b 100644
--- a/src/utility/STM32Cube_FW/ble_bufsize.h
+++ b/src/utility/STM32_WPAN/ble_bufsize.h
@@ -75,13 +75,6 @@
           ((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
                       BLE_MBLOCKS_SECURE_CONNECTIONS))
 
-/*
- * BLE_DEFAULT_MBLOCKS_COUNT: default memory blocks count
- */
-#define BLE_DEFAULT_MBLOCKS_COUNT(n_link) \
-          BLE_MBLOCKS_CALC(BLE_DEFAULT_PREP_WRITE_LIST_SIZE, \
-                           BLE_DEFAULT_MAX_ATT_MTU, n_link)
-
 /*
  * BLE_FIXED_BUFFER_SIZE_BYTES:
  * A part of the RAM, is dynamically allocated by initializing all the pointers
diff --git a/src/utility/STM32Cube_FW/hw.h b/src/utility/STM32_WPAN/hw.h
similarity index 100%
rename from src/utility/STM32Cube_FW/hw.h
rename to src/utility/STM32_WPAN/hw.h
diff --git a/src/utility/STM32Cube_FW/hw_ipcc.c b/src/utility/STM32_WPAN/hw_ipcc.c
similarity index 99%
rename from src/utility/STM32Cube_FW/hw_ipcc.c
rename to src/utility/STM32_WPAN/hw_ipcc.c
index c7304823..3461cbed 100644
--- a/src/utility/STM32Cube_FW/hw_ipcc.c
+++ b/src/utility/STM32_WPAN/hw_ipcc.c
@@ -17,6 +17,7 @@
   ******************************************************************************
   */
 /* USER CODE END Header */
+
 #if defined(STM32WBxx)
 /* Includes ------------------------------------------------------------------*/
 #include "hw.h"
diff --git a/src/utility/STM32Cube_FW/mbox_def.h b/src/utility/STM32_WPAN/mbox_def.h
similarity index 100%
rename from src/utility/STM32Cube_FW/mbox_def.h
rename to src/utility/STM32_WPAN/mbox_def.h
diff --git a/src/utility/STM32Cube_FW/shci.c b/src/utility/STM32_WPAN/shci.c
similarity index 97%
rename from src/utility/STM32Cube_FW/shci.c
rename to src/utility/STM32_WPAN/shci.c
index 4525656e..40110f42 100644
--- a/src/utility/STM32Cube_FW/shci.c
+++ b/src/utility/STM32_WPAN/shci.c
@@ -16,6 +16,7 @@
  ******************************************************************************
  */
 
+
 #if defined(STM32WBxx)
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_wpan_common.h"
@@ -644,6 +645,26 @@ SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void )
   return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
 }
 
+SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = (uint8_t)clockSel;
+
+  shci_send( SHCI_OPCODE_C2_SET_SYSTEM_CLOCK,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
 /**
  *  Local System COMMAND
  *  These commands are NOT sent to the CPU2
diff --git a/src/utility/STM32Cube_FW/shci.h b/src/utility/STM32_WPAN/shci.h
similarity index 96%
rename from src/utility/STM32Cube_FW/shci.h
rename to src/utility/STM32_WPAN/shci.h
index 750fa972..30ae10cb 100644
--- a/src/utility/STM32Cube_FW/shci.h
+++ b/src/utility/STM32_WPAN/shci.h
@@ -227,6 +227,7 @@ extern "C" {
     SHCI_OCF_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME,
     SHCI_OCF_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION,
     SHCI_OCF_C2_802_15_4_DEINIT,
+    SHCI_OCF_C2_SET_SYSTEM_CLOCK,
   } SHCI_OCF_t;
 
 #define SHCI_OPCODE_C2_FUS_GET_STATE         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_GET_STATE)
@@ -436,7 +437,7 @@ extern "C" {
    * PrWriteListSize
    * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
    *
-   * Maximum number of supported “prepare write request”
+   * Maximum number of supported "prepare write request"
    *    - Min value: given by the macro DEFAULT_PREP_WRITE_LIST_SIZE
    *    - Max value: a value higher than the minimum required can be specified, but it is not recommended
    */
@@ -464,20 +465,20 @@ extern "C" {
   uint16_t AttMtu;
 
   /**
-   * SlaveSca
-   * The sleep clock accuracy (ppm value) that used in BLE connected slave mode to calculate the window widening
+   * PeripheralSca
+   * The sleep clock accuracy (ppm value) that used in BLE connected Peripheral mode to calculate the window widening
    * (in combination with the sleep clock accuracy sent by master in CONNECT_REQ PDU),
    * refer to BLE 5.0 specifications - Vol 6 - Part B - chap 4.5.7 and 4.2.2
    *     - Min value: 0
    *     - Max value: 500 (worst possible admitted by specification)
    */
-  uint16_t SlaveSca;
+  uint16_t PeripheralSca;
 
   /**
-   * MasterSca
-   * The sleep clock accuracy handled in master mode. It is used to determine the connection and advertising events timing.
+   * CentralSca
+   * The sleep clock accuracy handled in Central mode. It is used to determine the connection and advertising events timing.
    * It is transmitted to the slave in CONNEC_REQ PDU used by the slave to calculate the window widening,
-   * see SlaveSca and Bluetooth Core Specification v5.0 Vol 6 - Part B - chap 4.5.7 and 4.2.2
+   * see PeripheralSca and Bluetooth Core Specification v5.0 Vol 6 - Part B - chap 4.5.7 and 4.2.2
    * Possible values:
    *    - 251 ppm to 500 ppm: 0
    *    - 151 ppm to 250 ppm: 1
@@ -488,7 +489,7 @@ extern "C" {
    *    - 21 ppm to 30 ppm: 6
    *    - 0 ppm to 20 ppm: 7
    */
-  uint8_t MasterSca;
+  uint8_t CentralSca;
 
   /**
    * LsSource
@@ -503,7 +504,7 @@ extern "C" {
    * MaxConnEventLength
    * This parameter determines the maximum duration of a slave connection event. When this duration is reached the slave closes
    * the current connections event (whatever is the CE_length parameter specified by the master in HCI_CREATE_CONNECTION HCI command),
-   * expressed in units of 625/256 µs (~2.44 µs)
+   * expressed in units of 625/256 us (~2.44 us)
    *    - Min value: 0 (if 0 is specified, the master and slave perform only a single TX-RX exchange per connection event)
    *    - Max value: 1638400 (4000 ms). A higher value can be specified (max 0xFFFFFFFF) but results in a maximum connection time
    *      of 4000 ms as specified. In this case the parameter is not applied, and the predicted CE length calculated on slave is not shortened
@@ -512,7 +513,7 @@ extern "C" {
 
   /**
    * HsStartupTime
-   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 µs (~2.44 µs).
+   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us).
    *    - Min value: 0
    *    - Max value:  820 (~2 ms). A higher value can be specified, but the value that implemented in stack is forced to ~2 ms
    */
@@ -598,7 +599,7 @@ extern "C" {
   int16_t rx_path_compens;
 
   /* BLE core specification version (8-bit unsigned integer).
-   * values as: 11(5.2), 12(5.3)
+   * values as: 11(5.2), 12(5.3), 13(5.4)
    */
   uint8_t ble_core_version;
 
@@ -829,6 +830,7 @@ extern "C" {
     /** No response parameters*/
 
 #define SHCI_OPCODE_C2_CONFIG   (( SHCI_OGF << 10) + SHCI_OCF_C2_CONFIG)
+
   /** Command parameters */
     typedef PACKED_STRUCT{
       uint8_t PayloadCmdSize;
@@ -843,6 +845,15 @@ extern "C" {
 
 #define SHCI_OPCODE_C2_802_15_4_DEINIT    (( SHCI_OGF << 10) + SHCI_OCF_C2_802_15_4_DEINIT)
 
+#define SHCI_OPCODE_C2_SET_SYSTEM_CLOCK   (( SHCI_OGF << 10) + SHCI_OCF_C2_SET_SYSTEM_CLOCK)
+  /** Command parameters */
+    typedef enum
+    {
+      SET_SYSTEM_CLOCK_HSE_TO_PLL,
+      SET_SYSTEM_CLOCK_PLL_ON_TO_HSE,
+      SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE,
+    }SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t;
+
 /**
  * PayloadCmdSize
  * Value that shall be used
@@ -859,8 +870,8 @@ extern "C" {
 /**
  * Device ID
  */
-#define SHCI_C2_CONFIG_STM32WB55xx                   (0x495)
-#define SHCI_C2_CONFIG_STM32WB15xx                   (0x494)
+#define SHCI_C2_CONFIG_STM32WB55xx                    (0x495)
+#define SHCI_C2_CONFIG_STM32WB15xx                    (0x494)
 
 /**
  * Config1
@@ -878,7 +889,7 @@ extern "C" {
  */
 #define SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE               (1<<0)
 #define SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE        (1<<1)
-#define SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE         (1<<2)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE     (1<<2)
 #define SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE           (1<<3)
 #define SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE             (1<<4)
 #define SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE           (1<<5)
@@ -965,7 +976,8 @@ extern "C" {
 #define INFO_STACK_TYPE_ZIGBEE_RFD                  0x31
 #define INFO_STACK_TYPE_MAC                         0x40
 #define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC       0x50
-#define INFO_STACK_TYPE_BLE_THREAD_FTD_DYAMIC       0x51
+#define INFO_STACK_TYPE_BLE_THREAD_FTD_DYNAMIC      0x51
+#define INFO_STACK_TYPE_BLE_THREAD_LIGHT_DYNAMIC    0x52
 #define INFO_STACK_TYPE_802154_LLD_TESTS            0x60
 #define INFO_STACK_TYPE_802154_PHY_VALID            0x61
 #define INFO_STACK_TYPE_BLE_PHY_VALID               0x62
@@ -1364,9 +1376,24 @@ typedef struct {
    */
   SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void );
 
-  #ifdef __cplusplus
+  /**
+  * SHCI_C2_SetSystemClock
+  * @brief Request CPU2 to change system clock
+  *
+  * @param clockSel: It can be one of the following list
+  *                -  SET_SYSTEM_CLOCK_HSE_TO_PLL : CPU2 set system clock to PLL, PLL must be configured and started before.
+  *                -  SET_SYSTEM_CLOCK_PLL_ON_TO_HSE : CPU2 set System clock to HSE, PLL is still ON after command execution.
+  *                -  SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE : CPU2 set System clock to HSE, PLL is turned OFF after command execution.
+  *
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel );
+
+
+#ifdef __cplusplus
 }
 #endif
 
 #endif /*__SHCI_H */
 
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/src/utility/STM32Cube_FW/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
similarity index 99%
rename from src/utility/STM32Cube_FW/shci_tl.c
rename to src/utility/STM32_WPAN/shci_tl.c
index 60380251..25e1a214 100644
--- a/src/utility/STM32Cube_FW/shci_tl.c
+++ b/src/utility/STM32_WPAN/shci_tl.c
@@ -16,6 +16,7 @@
  ******************************************************************************
  */
 
+
 #if defined(STM32WBxx)
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_wpan_common.h"
diff --git a/src/utility/STM32Cube_FW/shci_tl.h b/src/utility/STM32_WPAN/shci_tl.h
similarity index 100%
rename from src/utility/STM32Cube_FW/shci_tl.h
rename to src/utility/STM32_WPAN/shci_tl.h
diff --git a/src/utility/STM32Cube_FW/stm32_wpan_common.h b/src/utility/STM32_WPAN/stm32_wpan_common.h
similarity index 100%
rename from src/utility/STM32Cube_FW/stm32_wpan_common.h
rename to src/utility/STM32_WPAN/stm32_wpan_common.h
diff --git a/src/utility/STM32Cube_FW/stm_list.c b/src/utility/STM32_WPAN/stm_list.c
similarity index 99%
rename from src/utility/STM32Cube_FW/stm_list.c
rename to src/utility/STM32_WPAN/stm_list.c
index 4e8c3643..df6c2155 100644
--- a/src/utility/STM32Cube_FW/stm_list.c
+++ b/src/utility/STM32_WPAN/stm_list.c
@@ -16,6 +16,7 @@
   ******************************************************************************
   */
 
+
 #if defined(STM32WBxx)
 /******************************************************************************
  * Include Files
diff --git a/src/utility/STM32Cube_FW/stm_list.h b/src/utility/STM32_WPAN/stm_list.h
similarity index 100%
rename from src/utility/STM32Cube_FW/stm_list.h
rename to src/utility/STM32_WPAN/stm_list.h
diff --git a/src/utility/STM32Cube_FW/tl.h b/src/utility/STM32_WPAN/tl.h
similarity index 100%
rename from src/utility/STM32Cube_FW/tl.h
rename to src/utility/STM32_WPAN/tl.h
diff --git a/src/utility/STM32Cube_FW/tl_dbg_conf.h b/src/utility/STM32_WPAN/tl_dbg_conf.h
similarity index 100%
rename from src/utility/STM32Cube_FW/tl_dbg_conf.h
rename to src/utility/STM32_WPAN/tl_dbg_conf.h
diff --git a/src/utility/STM32Cube_FW/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
similarity index 99%
rename from src/utility/STM32Cube_FW/tl_mbox.c
rename to src/utility/STM32_WPAN/tl_mbox.c
index 11393162..40c96793 100644
--- a/src/utility/STM32Cube_FW/tl_mbox.c
+++ b/src/utility/STM32_WPAN/tl_mbox.c
@@ -56,6 +56,7 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_Mac_802_15_4_t TL_Mac_802_15_4_Table;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ZigbeeTable_t TL_Zigbee_Table;
 #endif
+
 /**< tables */
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  FreeBufQueue;
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  TracesEvtQueue;