bgklika

diff --git a/src/amazon-freertos/vendors/espressif/boards/esp32/ports/wifi/iot_wifi.c b/src/amazon-freertos/vendors/espressif/boards/esp32/ports/wifi/iot_wifi.c
index 98d964e36..99bad7122 100644
--- a/src/amazon-freertos/vendors/espressif/boards/esp32/ports/wifi/iot_wifi.c
+++ b/src/amazon-freertos/vendors/espressif/boards/esp32/ports/wifi/iot_wifi.c
@@ -1089,24 +1109,32 @@ WIFIReturnCode_t WIFI_NetworkDelete( uint16_t usIndex )
 				xRet = prvInitRegistry( xNvsHandle );
 			}
 		}
-		if( xRet == ESP_OK && usIndex < xRegistry.usNumNetworks )
+		if( xRet == ESP_OK )

bgklika

diff --git a/src/amazon-freertos/libraries/c_sdk/standard/ble/include/iot_ble.h b/src/amazon-freertos/libraries/c_sdk/standard/ble/include/iot_ble.h
index 674d7015c..3fc2e7d7c 100644
--- a/src/amazon-freertos/libraries/c_sdk/standard/ble/include/iot_ble.h
+++ b/src/amazon-freertos/libraries/c_sdk/standard/ble/include/iot_ble.h
@@ -660,4 +660,6 @@ BTStatus_t IotBle_SetDeviceName( const char * pName,
                                  size_t length );
 /* @[declare_iotble_setdevicename] */
 
+BTStatus_t IotBle_SetStopAdvCallback( IotBle_StopAdvCallback_t pStopAdvCb );
+

bgklika

diff --git a/src/amazon-freertos/libraries/freertos_plus/aws/ota/src/mqtt/aws_iot_ota_mqtt.c b/src/amazon-freertos/libraries/freertos_plus/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
index 634f21885..c185e6755 100644
--- a/src/amazon-freertos/libraries/freertos_plus/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
+++ b/src/amazon-freertos/libraries/freertos_plus/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
@@ -391,6 +391,12 @@ static OTA_Err_t prvPublishStatusMessage( OTA_AgentContext_t * pxAgentCtx,
     IotMqttError_t eResult;
     char pcTopicBuffer[ OTA_MAX_TOPIC_LEN ];
 
+    if( NULL == pxAgentCtx || NULL == pxAgentCtx->pcThingName || NULL == pxAgentCtx->pcOTA_Singleton_ActiveJobName )
+    {

bgklika

diff --git a/src/amazon-freertos/libraries/c_sdk/standard/ble/src/iot_ble_gatt.c b/src/amazon-freertos/libraries/c_sdk/standard/ble/src/iot_ble_gatt.c
index 5f45e9ed4..ff2fc77d7 100644
--- a/src/amazon-freertos/libraries/c_sdk/standard/ble/src/iot_ble_gatt.c
+++ b/src/amazon-freertos/libraries/c_sdk/standard/ble/src/iot_ble_gatt.c
@@ -562,14 +562,12 @@ void _mtuChangedCb( uint16_t connId,
     IotLink_t * pEventListIndex;
     _bleSubscrEventListElement_t * pEventIndex;
 
-    IotMutex_Lock( &_BTInterface.threadSafetyMutex );
     /* Get the event associated to the callback */

bgklika

diff --git a/src/amazon-freertos/libraries/c_sdk/standard/ble/src/services/wifi_provisioning/iot_ble_wifi_provisioning.c b/src/amazon-freertos/libraries/c_sdk/standard/ble/src/services/wifi_provisioning/iot_ble_wifi_provisioning.c
index 9b682d99d..8ad854bec 100644
--- a/src/amazon-freertos/libraries/c_sdk/standard/ble/src/services/wifi_provisioning/iot_ble_wifi_provisioning.c
+++ b/src/amazon-freertos/libraries/c_sdk/standard/ble/src/services/wifi_provisioning/iot_ble_wifi_provisioning.c
@@ -1215,13 +1215,33 @@ WIFIReturnCode_t _connectNetwork( WIFINetworkProfile_t * pProfile )
     networkParams.ucSSIDLength = pProfile->ucSSIDLength;
     networkParams.xSecurity = pProfile->xSecurity;
 
-    if( ( networkParams.xSecurity == eWiFiSecurityWPA2 ) || ( networkParams.xSecurity == eWiFiSecurityWPA ) )
+    switch( networkParams.xSecurity )