diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
index 3d9b8dac07..7491add70a 100644
--- a/features/device_key/source/DeviceKey.cpp
+++ b/features/device_key/source/DeviceKey.cpp
@@ -260,7 +260,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
         return DEVICEKEY_INVALID_PARAM;
     }
 
-#if DEVICE_TRNG
+#if defined(DEVICE_TRNG) || defined(MBEDTLS_ENTROPY_NV_SEED)
     uint32_t test_buff[DEVICE_KEY_32BYTE / sizeof(int)];
     mbedtls_entropy_context *entropy = new mbedtls_entropy_context;
     mbedtls_entropy_init(entropy);
@@ -276,6 +276,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
 
     mbedtls_entropy_free(entropy);
     delete entropy;
+
 #endif
 
     return ret;
diff --git a/platform/mbed_version.h b/platform/mbed_version.h
index 374ef0ed11..1c32536c1d 100644
--- a/platform/mbed_version.h
+++ b/platform/mbed_version.h
@@ -44,7 +44,7 @@
   *
   * @note 99 is default value for development version (master branch)
   */
-#define MBED_PATCH_VERSION 4
+#define MBED_PATCH_VERSION 5
 
 #define MBED_ENCODE_VERSION(major, minor, patch) ((major)*10000 + (minor)*100 + (patch))
 
diff --git a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.ar b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.ar
index e66773bf81..3fedabb628 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.ar and b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.ar differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.ar b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.ar
index 6d0950c9fe..5d932ee136 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.ar and b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.ar differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.ar b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.ar
index c46e6813b1..562801dd90 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.ar and b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.ar differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.ar b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.ar
index 3bb8231a55..f1929a4979 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.ar and b/targets/TARGET_WICED/TOOLCHAIN_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.ar differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a
index 2a9e21051c..474126d3a2 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a
index 1f31134c80..2407038328 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a
index e8068b9c94..e9eb1d059b 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.a
index ec26bce898..17c964f6eb 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_GCC_ARM/TARGET_CYW943012P6EVB_01/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a
index d96b536444..7bb0ad495f 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_4343W/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a
index e60b7afbd9..aaaf9ae042 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CKIT_062_WIFI_BT/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a
index 493e7bcd1a..d9c59f4635 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CY8CMOD_062_4343W/libwiced_drivers.a differ
diff --git a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CYW943012P6EVB_01/libwiced_drivers.a b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CYW943012P6EVB_01/libwiced_drivers.a
index 7c37007900..eeb5eef048 100644
Binary files a/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CYW943012P6EVB_01/libwiced_drivers.a and b/targets/TARGET_WICED/TOOLCHAIN_IAR/TARGET_CYW943012P6EVB_01/libwiced_drivers.a differ