diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt
index 496c5d7579e..346168bc33f 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt
@@ -6,4 +6,4 @@
  * MAC address is printed during WHD power up
  */
 
-#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:d6:93:82"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:2f:32:99"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h
index d54eb02eba8..e89e05efbae 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h
@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.60.0-rc1"
-#define WHD_BRANCH "v1.60.0-rc1"
-#define WHD_DATE "2019-11-13 21:27:38 -0600"
+#define WHD_VERSION "v1.70.0"
+#define WHD_BRANCH "v1.70.0"
+#define WHD_DATE "2019-12-02 04:14:53 -0600"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h
index 72a2d4b220c..205c912d115 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h
@@ -166,9 +166,10 @@ typedef enum
     WLC_E_PFN_SCAN_COMPLETE = 138,     /* PFN completed scan of network list */
     WLC_E_RMC_EVENT = 139,     /* RMC Event */
     WLC_E_DPSTA_INTF_IND = 140,     /* DPSTA interface indication */
-    WLC_E_RRM = 141,     /* RRM Event */
-    WLC_E_ULP = 146,     /* ULP entry event */
-    WLC_E_LAST = 147,     /** highest val + 1 for range checking */
+    WLC_E_RRM = 141,                /* RRM Event */
+    WLC_E_ULP = 146,                /* ULP entry event */
+    WLC_E_TKO = 151,                /* TCP Keep Alive Offload Event */
+    WLC_E_LAST = 152,               /* highest val + 1 for range checking */
 } whd_event_num_t;
 
 #define WLC_SUP_STATUS_OFFSET      (256)
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c
index d49dd48a25a..8d901c38ea4 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c
@@ -746,12 +746,14 @@ uint32_t whd_wifi_stop_ap(whd_interface_t ifp)
         return result2;
     }
 
-    /* Disable AP mode */
-    data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
-    CHECK_IOCTL_BUFFER_WITH_SEMAPHORE(data, &ap->whd_wifi_sleep_flag);
-    *data = 0; /* Turn off AP */
-    CHECK_RETURN_WITH_SEMAPHORE(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0),
-                                &ap->whd_wifi_sleep_flag);
+    /* Disable AP mode only if AP is on primary interface */
+    if (prim_ifp == ifp)
+    {
+        data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
+        CHECK_IOCTL_BUFFER(data);
+        *data = 0;
+        CHECK_RETURN(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0) );
+    }
 
     CHECK_RETURN(whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_AP_EVENT_ENTRY]) );
     ifp->event_reg_list[WHD_AP_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/firmware/TARGET_43438/resources.h b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/firmware/TARGET_43438/resources.h
deleted file mode 100644
index 2f6e626b332..00000000000
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/firmware/TARGET_43438/resources.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2019, Cypress Semiconductor Corporation, All Rights Reserved
- * SPDX-License-Identifier: LicenseRef-PBL
- *
- * This file and the related binary are licensed under the
- * Permissive Binary License, Version 1.0 (the "License");
- * you may not use these files except in compliance with the License.
- *
- * You may obtain a copy of the License here:
- * LICENSE-permissive-binary-license-1.0.txt and at
- * https://www.mbed.com/licenses/PBL-1.0
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Automatically generated file - this comment ensures resources.h file creation */
-/* Auto-generated header file. Do not edit */
-#ifndef INCLUDED_RESOURCES_H_
-#define INCLUDED_RESOURCES_H_
-#include "wiced_resource.h"
-
-extern const resource_hnd_t wifi_firmware_image;
-extern const resource_hnd_t wifi_firmware_clm_blob;
-extern const unsigned char wifi_firmware_image_data[420690];
-extern const unsigned char wifi_firmware_clm_blob_image_data[7222];
-
-#endif /* ifndef INCLUDED_RESOURCES_H_ */
-