Rename FreeRTOS-IoT-Libraries directory (#109)

* Rename both Demo/FreeRTOS-IoT-Libraries and Source/FreeRTOS_IoT_Libraries directories to FreeRTOS-IoT-Libraries-LTS-Beta1

* Rename directories within IDE project and source files

* Remove backup files pushed to remote accidentally

* Remaining directory name replacements in file texts

384 files changed, 2835 insertions, 2771 deletions

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/DemoTasks/SimpleHTTPSExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/DemoTasks/SimpleHTTPSExamples.c
new file mode 100755
index 000000000..316cb48fb
--- /dev/null
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/DemoTasks/SimpleHTTPSExamples.c
@@ -0,0 +1,482 @@
+/*
+ * FreeRTOS Kernel V10.3.0
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * http://www.FreeRTOS.org
+ * http://aws.amazon.com/freertos
+ *
+ * 1 tab == 4 spaces!
+ */
+
+/*
+ * This file contains the common functions for plain text, basic TLS, and mutual
+ * authentication HTTPS demos. Aside from the difference in security level during
+ * connect, the three demos perform the same interaction with a HTTPS host. The
+ * demo creates a singe application task that loops through a set of examples
+ * demonstrating how to the connect to the server, send a few types of requests to
+ * the server (GET, HEAD, PUT, POST), and disconnect from the server again. All
+ * of the responses and their associated HTTPS response status codes are printed
+ * to the console.
+ *
+ * The plain text HTTP demo does not authenticate the server nor the client. The
+ * basic TLS HTTPS demo builds on top of the plain text demo, adding broker
+ * authentication and encryption. The mutual authentication HTTPS demo builds on
+ * top of the basic TLS demo, enabling both server and client authentication.
+ *
+ * For more information regarding the HTTPS library and the demo, please refer to:
+ * https://www.freertos.org/https/index.html
+ */
+
+/* Standard includes. */
+#include <string.h>
+#include <stdio.h>
+
+/* Kernel includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* FreeRTOS+TCP includes. */
+#include "FreeRTOS_IP.h"
+
+/* IoT SDK includes. */
+#include "iot_https_client.h"
+#include "platform/iot_network_freertos.h"
+
+/* HTTPS Demo Select */
+#include "demo_config.h"
+
+/* Select HTTPS profile based on the setting in demo_config.h */
+#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
+    #include "aws_iot_demo_profile.h"
+#else
+    #include "https_demo_profile.h"
+#endif
+
+/* Preprocessor check iot configuration */
+#include "aws_iot_setup_check.h"
+
+/*
+ * Set the connection profile based on settings in demo_config.h. For more
+ * information on each variable, please refer to the respective *_profile.h
+ * file in FreeRTOS-Labs\Demo\FreeRTOS-IoT-Libraries-LTS-Beta1\include.
+ *
+ * Note that if you are running the https_tls_mutual_auth demo please make sure
+ * to visit the following link for setup:
+ * https://www.freertos.org/https/preconfiguredexamplesMA.html
+ */
+#if defined( AWS_IOT_DEMO_PROFILE_H )
+    #define httpsexampleHTTPS_SERVER_ADDRESS        awsiotdemoprofileAWS_ENDPOINT
+    #define httpsexampleHTTPS_SERVER_PORT           awsiotdemoprofileAWS_HTTPS_PORT
+    #define httpsexampleHTTPS_SERVER_CERTIFICATE    awsiotdemoprofileAWS_CERTIFICATE_PEM
+    #define httpsexampleCLIENT_CERTIFICATE_PEM      awsiotdemoprofileCLIENT_CERTIFICATE_PEM
+    #define httpsexampleCLIENT_PRIVATE_KEY_PEM      awsiotdemoprofileCLIENT_PRIVATE_KEY_PEM
+#elif defined( HTTPS_DEMO_PROFILE_H )
+    #define httpsexampleHTTPS_SERVER_ADDRESS        httpsdemoprofileSERVER_ADDRESS
+    #define httpsexampleHTTPS_SERVER_PORT           httpsdemoprofileSERVER_PORT
+    #define httpsexampleHTTPS_SERVER_CERTIFICATE    httpsdemoprofileSERVER_CERTIFICATE_PEM
+#endif
+
+/*
+ * Each preconfigured host supports different request paths. In this demo, we
+ * are using httpbin and AWS IoT.
+ *
+ * In the demos that uses httpbin.org see http://httpbin.org/#/HTTP_Methods for
+ * details on supported REST API.
+ **/
+#if defined( AWS_IOT_DEMO_PROFILE_H )
+    #define httpsexampleHTTPS_POST_PATH    "/topics/" awsiotdemoprofileCLIENT_IDENTIFIER
+#elif defined( HTTPS_DEMO_PROFILE_H )
+    #define httpsexampleHTTPS_GET_PATH     "/ip"
+    #define httpsexampleHTTPS_HEAD_PATH    "/ip"
+    #define httpsexampleHTTPS_PUT_PATH     "/put"
+    #define httpsexampleHTTPS_POST_PATH    "/post"
+#endif
+
+/**
+ * @brief The length in bytes of the user buffer to store the HTTPS Client library
+ * connection context.
+ *
+ * The minimum size can be found in @ref connectionUserBufferMinimumSize.
+ */
+#define httpsexampleCONNECTION_USER_BUFFER_LENGTH    ( 512 )
+
+/**
+ * @brief The length in bytes of the user buffer to store the HTTPS Client library
+ * request context.
+ *
+ * The minimum size can be found in @ref requestUserBufferMinimumSize.
+ */
+#define httpsexampleREQUEST_USER_BUFFER_LENGTH       ( 512 )
+
+/**
+ * @brief The length in bytes of the user buffer to store the HTTPS Client library
+ * response context.
+ */
+#define httpsexampleRESPONSE_USER_BUFFER_LENGTH      ( 512 )
+
+/**
+ * @brief Some text to send as the request body for a PUT and POST request in
+ * this examples.
+ */
+#define httpsexampleREQUEST_BODY_TEXT                "Hello, world!"
+
+/**
+ * @brief The length in bytes of the buffer used to receive the response body.
+ */
+#define httpsexampleRESPONSE_BODY_BUFFER_LENGTH      ( 512 )
+
+/**
+ * @brief Timeout in ms for HTTPS operations in this example.
+ */
+#define httpsexampleHTTPS_TIMEOUT_MS                 ( 5000 )
+
+/*-----------------------------------------------------------*/
+
+/**
+ * @brief The HTTPS connection handle used in this example.
+ */
+static IotHttpsConnectionHandle_t xHTTPSConnection = IOT_HTTPS_CONNECTION_HANDLE_INITIALIZER;
+
+/**
+ * @brief A buffer used to store the HTTPS Client library's connection context.
+ */
+static uint8_t ucHTTPSConnectionUserBuffer[ httpsexampleCONNECTION_USER_BUFFER_LENGTH ] = { 0 };
+
+/**
+ * @brief A buffer used to store the HTTPS Client library's request context and
+ * some headers.
+ */
+static uint8_t ucHTTPSRequestUserBuffer[ httpsexampleREQUEST_USER_BUFFER_LENGTH ] = { 0 };
+
+/**
+ * @brief A buffer used to store the HTTPS Client library's response context and
+ * some headers.
+ */
+static uint8_t ucHTTPSResponseUserBuffer[ httpsexampleRESPONSE_USER_BUFFER_LENGTH ] = { 0 };
+
+/**
+ * @brief The request body.
+ */
+static char cHTTPSRequestBodyBuffer[] = httpsexampleREQUEST_BODY_TEXT;
+
+/**
+ * @brief A buffer used to receive the HTTPS Client library's response body.
+ */
+static uint8_t ucHTTPSResponseBodyBuffer[ httpsexampleRESPONSE_BODY_BUFFER_LENGTH ] = { 0 };
+
+/**
+ * @brief The task used to demonstrate the HTTPS Client API.
+ *
+ * @param[in] pvParameters Parameters as passed at the time of task creation. Not
+ *            used in this example.
+ */
+static void prvHTTPSDemoTask( void * pvParameters );
+
+/**
+ * @brief Connects to the HTTPS server as specified in httpsexampleHTTPS_SERVER_ADDRESS
+ * and httpsexampleHTTPS_SERVER_PORT.
+ */
+static void prvHTTPSConnect( void );
+
+/**
+ * @brief Creates and sends an HTTPS request to the HTTPS server specified in
+ * httpsexampleHTTPS_SERVER_ADDRESS and httpsexampleHTTPS_SERVER_PORT.
+ *
+ * @param[in] xMethod The HTTPS method to use. Please #IotHttpsMethod_t for
+ *            possible parameters.
+ * @param[in] pcPath The path for the HTTPS request.
+ * @param[in] ulPathLength The length of the input pcPath.
+ */
+static void prvHTTPSRequest( IotHttpsMethod_t xMethod,
+                             const char * pcPath,
+                             uint32_t ulPathLength );
+
+/**
+ * @brief Disconnects from the HTTPS server.
+ */
+static void prvHTTPSDisconnect( void );
+
+/**
+ * @brief Initializes the IoT libraries used by this demo.
+ */
+static void prvInitialiseLibraries( void );
+
+static const IotHttpsConnectionInfo_t xConnectionInfo =
+{
+    /* No connection to the HTTPS server has been established yet and we want to
+     * establish a new connection. */
+    .pAddress             = httpsexampleHTTPS_SERVER_ADDRESS,
+    .addressLen           = sizeof( httpsexampleHTTPS_SERVER_ADDRESS ) - 1,
+    .port                 = httpsexampleHTTPS_SERVER_PORT,
+    .userBuffer.pBuffer   = ucHTTPSConnectionUserBuffer,
+    .userBuffer.bufferLen = sizeof( ucHTTPSConnectionUserBuffer ),
+
+    /* Use FreeRTOS+TCP network. */
+    .pNetworkInterface    = IOT_NETWORK_INTERFACE_FREERTOS,
+
+    /* The HTTPS Client library uses TLS by default as indicated by the "S"
+    * postfixed to "HTTP" in the name of the library and its types and
+    * functions. There are no configurations in the flags to enable TLS. */
+    .flags                = 0,
+
+    /* Optional TLS extensions. For this demo, they are disabled. */
+    .pAlpnProtocols       = NULL,
+    .alpnProtocolsLen     = 0,
+
+    /* Provide the certificate for authenticating the server. */
+    #if ( democonfigENABLE_TLS == 1 )
+        .pCaCert          = httpsexampleHTTPS_SERVER_CERTIFICATE,
+        .caCertLen        = sizeof( httpsexampleHTTPS_SERVER_CERTIFICATE ),
+    #else
+        .pCaCert          = NULL,
+        .caCertLen        = 0,
+    #endif
+
+    /* The HTTPS server at httpbin.org:443 does not require client certificates,
+     * but AWS IoT does.
+     * If the server were to require a client certificate, the following members
+     * need to be set. */
+    #if ( democonfigENABLE_MUTUAL_AUTH == 1 )
+        .pClientCert      = httpsexampleCLIENT_CERTIFICATE_PEM,
+        .clientCertLen    = sizeof( httpsexampleCLIENT_CERTIFICATE_PEM ),
+        .pPrivateKey      = httpsexampleCLIENT_PRIVATE_KEY_PEM,
+        .privateKeyLen    = sizeof( httpsexampleCLIENT_PRIVATE_KEY_PEM )
+    #else
+           .pClientCert   = NULL,
+        .clientCertLen    = 0,
+        .pPrivateKey      = NULL,
+        .privateKeyLen    = 0
+                            #endif
+};
+/*-----------------------------------------------------------*/
+
+void vStartSimpleHTTPSDemo( void )
+{
+    /* This example uses a single application task, which in turn is used to
+    * connect, send a few requests, and disconnect from the HTTPS server. */
+    xTaskCreate( prvHTTPSDemoTask,         /* Function that implements the task. */
+                 "HTTPSDemo",              /* Text name for the task - only used for debugging. */
+                 democonfigDEMO_STACKSIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
+                 NULL,                     /* Task parameter - not used in this case. */
+                 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
+                 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
+}
+/*-----------------------------------------------------------*/
+
+static void prvHTTPSDemoTask( void * pvParameters )
+{
+    /* Remove compiler warnings about unused parameters. */
+    ( void ) pvParameters;
+
+    /* One time initialization of the libraries used by this demo. */
+    prvInitialiseLibraries();
+
+    for( ; ; )
+    {
+        /****************************** Connect. ******************************/
+
+        /* Establish a connection to the HTTPS server. This example connects to
+         * the HTTPS server as specified in httpsexampleHTTPS_SERVER_ADDRESS and
+         * httpsexampleHTTPS_SERVER_PORT at the top of this file. Please change
+         * it to the HTTPS server you want to connect to. */
+        configPRINTF( ( "Attempt to connect to %s:%d\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
+        prvHTTPSConnect();
+        configPRINTF( ( "Connected to %s:%d\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
+
+        /*********************** Send HTTPS requests. ************************/
+
+        /* The client is now connected to the server. This example will send a
+         * GET, HEAD, PUT, and POST request. For AWS IoT profile, the example will
+         * only send a POST request.
+         **/
+        #if defined( httpsexampleHTTPS_GET_PATH )
+            configPRINTF( ( "Sending HTTPS GET request...\r\n" ) );
+            prvHTTPSRequest( IOT_HTTPS_METHOD_GET,
+                             httpsexampleHTTPS_GET_PATH,
+                             sizeof( httpsexampleHTTPS_GET_PATH ) - 1 );
+        #endif
+        #if defined( httpsexampleHTTPS_HEAD_PATH )
+            configPRINTF( ( "Sending HTTPS HEAD request...\r\n" ) );
+            prvHTTPSRequest( IOT_HTTPS_METHOD_HEAD,
+                             httpsexampleHTTPS_HEAD_PATH,
+                             sizeof( httpsexampleHTTPS_HEAD_PATH ) - 1 );
+        #endif
+        #if defined( httpsexampleHTTPS_PUT_PATH )
+            configPRINTF( ( "Sending HTTPS PUT request...\r\n" ) );
+            prvHTTPSRequest( IOT_HTTPS_METHOD_PUT,
+                             httpsexampleHTTPS_PUT_PATH,
+                             sizeof( httpsexampleHTTPS_PUT_PATH ) - 1 );
+        #endif
+        #if defined( httpsexampleHTTPS_POST_PATH )
+            configPRINTF( ( "Sending HTTPS POST request...\r\n" ) );
+            prvHTTPSRequest( IOT_HTTPS_METHOD_POST,
+                             httpsexampleHTTPS_POST_PATH,
+                             sizeof( httpsexampleHTTPS_POST_PATH ) - 1 );
+        #endif
+
+        /**************************** Disconnect. *****************************/
+
+        prvHTTPSDisconnect();
+        configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
+
+        /* Wait between iterations to avoid server throttling. */
+
+        configPRINTF( ( "prvHTTPSDemoTask() completed an iteration successfully. "
+                        "Total free heap is %u\r\n",
+                        xPortGetFreeHeapSize() ) );
+        configPRINTF( ( "Demo completed successfully.\r\n" ) );
+        configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
+        vTaskDelay( pdMS_TO_TICKS( httpsexampleHTTPS_TIMEOUT_MS ) );
+    }
+}
+
+/*-----------------------------------------------------------*/
+
+static void prvHTTPSConnect( void )
+{
+    IotHttpsReturnCode_t xHTTPSClientResult;
+
+    /* Establish the connection to the HTTPS server - It is a blocking call and
+     * will return only when the connection is complete or a timeout occurs. */
+    xHTTPSClientResult = IotHttpsClient_Connect( &( xHTTPSConnection ),
+                                                 &( xConnectionInfo ) );
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+}
+
+/*-----------------------------------------------------------*/
+
+static void prvHTTPSRequest( IotHttpsMethod_t xMethod,
+                             const char * pcPath,
+                             uint32_t ulPathLength )
+{
+    IotHttpsReturnCode_t xHTTPSClientResult;
+    IotHttpsRequestInfo_t xHTTPSRequestInfo = IOT_HTTPS_REQUEST_INFO_INITIALIZER;
+    IotHttpsResponseInfo_t xHTTPSResponseInfo = IOT_HTTPS_RESPONSE_INFO_INITIALIZER;
+    IotHttpsRequestHandle_t xHTTPSRequest = IOT_HTTPS_REQUEST_HANDLE_INITIALIZER;
+    IotHttpsResponseHandle_t xHTTPSResponse = IOT_HTTPS_RESPONSE_HANDLE_INITIALIZER;
+    IotHttpsSyncInfo_t xHTTPSSyncRequestInfo = IOT_HTTPS_SYNC_INFO_INITIALIZER;
+    IotHttpsSyncInfo_t xHTTPSSyncResponseInfo = IOT_HTTPS_SYNC_INFO_INITIALIZER;
+    uint16_t usResponseStatus = 0;
+
+    configASSERT( pcPath != NULL );
+
+    /************************** HTTPS request setup. ***************************/
+
+    if( ( xMethod == IOT_HTTPS_METHOD_PUT ) || ( xMethod == IOT_HTTPS_METHOD_POST ) )
+    {
+        xHTTPSSyncRequestInfo.pBody = ( uint8_t * ) cHTTPSRequestBodyBuffer;
+        xHTTPSSyncRequestInfo.bodyLen = sizeof( cHTTPSRequestBodyBuffer );
+    }
+    else
+    {
+        xHTTPSSyncRequestInfo.pBody = NULL;
+        xHTTPSSyncRequestInfo.bodyLen = 0;
+    }
+
+    xHTTPSRequestInfo.pHost = httpsexampleHTTPS_SERVER_ADDRESS;
+    xHTTPSRequestInfo.hostLen = sizeof( httpsexampleHTTPS_SERVER_ADDRESS ) - 1;
+    xHTTPSRequestInfo.pPath = pcPath;
+    xHTTPSRequestInfo.pathLen = ulPathLength;
+    xHTTPSRequestInfo.method = xMethod;
+    xHTTPSRequestInfo.isNonPersistent = false;
+    xHTTPSRequestInfo.userBuffer.pBuffer = ucHTTPSRequestUserBuffer;
+    xHTTPSRequestInfo.userBuffer.bufferLen = sizeof( ucHTTPSRequestUserBuffer ) - 1;
+    xHTTPSRequestInfo.isAsync = false;
+    xHTTPSRequestInfo.u.pSyncInfo = &xHTTPSSyncRequestInfo;
+
+    xHTTPSClientResult = IotHttpsClient_InitializeRequest( &( xHTTPSRequest ),
+                                                           &( xHTTPSRequestInfo ) );
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+
+    /************************** HTTPS response setup. **************************/
+
+    memset( ucHTTPSResponseBodyBuffer, 0, sizeof( ucHTTPSResponseBodyBuffer ) );
+
+    if( xMethod == IOT_HTTPS_METHOD_HEAD )
+    {
+        xHTTPSSyncResponseInfo.pBody = NULL;
+        xHTTPSSyncResponseInfo.bodyLen = 0;
+    }
+    else
+    {
+        xHTTPSSyncResponseInfo.pBody = ucHTTPSResponseBodyBuffer;
+        xHTTPSSyncResponseInfo.bodyLen = sizeof( ucHTTPSResponseBodyBuffer );
+    }
+
+    xHTTPSResponseInfo.userBuffer.pBuffer = ucHTTPSResponseUserBuffer;
+    xHTTPSResponseInfo.userBuffer.bufferLen = sizeof( ucHTTPSResponseUserBuffer );
+    xHTTPSResponseInfo.pSyncInfo = &xHTTPSSyncResponseInfo;
+
+    /*************************** Send HTTPS request. ***************************/
+
+    /* This synchronous send function blocks until the full response is received
+     * from the network. */
+    xHTTPSClientResult = IotHttpsClient_SendSync( xHTTPSConnection,
+                                                  xHTTPSRequest,
+                                                  &( xHTTPSResponse ),
+                                                  &( xHTTPSResponseInfo ),
+                                                  httpsexampleHTTPS_TIMEOUT_MS );
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+
+    /* The response status is only available if the httpsexampleRESPONSE_USER_BUFFER
+     * is large enough to fit not only the HTTPS Client response context, but
+     * also the Status-Line of the response. The Status-Line and the response
+     * headers are stored in the provided ucHTTPSResponseUserBuffer right after
+     * the HTTPS Client response context. */
+    xHTTPSClientResult = IotHttpsClient_ReadResponseStatus( xHTTPSResponse,
+                                                            &usResponseStatus );
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+
+    configPRINTF( ( "Response status: %d\r\n", usResponseStatus ) );
+    configPRINTF( ( "Response body: \r\n%s\r\n", ucHTTPSResponseBodyBuffer ) );
+
+    /* The response body may be too large for the print buffer. These extra
+     * carriage returns and newlines help with clobbering. */
+    configPRINTF( ( "\r\n\r\n" ) );
+}
+
+/*-----------------------------------------------------------*/
+
+static void prvHTTPSDisconnect( void )
+{
+    IotHttpsReturnCode_t xHTTPSClientResult;
+
+    /* The application must always explicitly disconnect from the server with
+     * this API if the last request sent on the connection was a persistent
+     * request. */
+    xHTTPSClientResult = IotHttpsClient_Disconnect( xHTTPSConnection );
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+}
+
+
+static void prvInitialiseLibraries( void )
+{
+    IotHttpsReturnCode_t xHTTPSClientResult;
+    IotNetworkError_t xNetworkResult;
+
+    /* Initialize the network stack abstraction for FreeRTOS. */
+    xNetworkResult = IotNetworkFreeRTOS_Init();
+    configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
+
+    /* HTTPS Client library must be initialized before it can be used. This is
+     * just one time initialization. */
+    xHTTPSClientResult = IotHttpsClient_Init();
+    configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
+}
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/netif.h
index 7b3e9cd3c..7b3e9cd3c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/atomic.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/atomic.h
index d9b063bf8..d9b063bf8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/atomic.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/atomic.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/demo_logging.c
index 8f94f559a..8f94f559a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/demo_logging.h
index 2cc068ce9..2cc068ce9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/main.c
index 5da701f0f..5da701f0f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/mbedtls_config.h
index 0b2d27a0c..0b2d27a0c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/printf-stdarg.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/printf-stdarg.c
index 84b87b2a4..84b87b2a4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/printf-stdarg.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/common/printf-stdarg.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/FreeRTOSConfig.h
index dd495cd91..dd495cd91 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/FreeRTOSIPConfig.h
index 1adbb82b2..1adbb82b2 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/READ_ME_INSTRUCTIONS.url
index ee97efa04..ee97efa04 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/WIN32.vcxproj
index eaa53d474..588279dc0 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,13 +146,13 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -179,18 +179,18 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/WIN32.vcxproj.filters
index 05e1e1a10..12b49aca8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/WIN32.vcxproj.filters
@@ -139,25 +139,25 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -165,7 +165,7 @@
     <ClCompile Include="..\common\DemoTasks\SimpleHTTPSExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -241,44 +241,44 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/demo_config.h
index 1ba58ba59..1ba58ba59 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/http_plain_text_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/http_plain_text_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/http_plain_text_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/http_plain_text_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/iot_config.h
index d3d489a4d..d3d489a4d 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/http_plain_text/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/http_plain_text/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/FreeRTOSConfig.h
index 642113c41..642113c41 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/FreeRTOSIPConfig.h
index 1adbb82b2..1adbb82b2 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
index ee97efa04..ee97efa04 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/WIN32.vcxproj
index 2b5fe76c1..48cec21bc 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,14 +146,14 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -496,19 +496,19 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/WIN32.vcxproj.filters
index d29362d6e..ba386c746 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/WIN32.vcxproj.filters
@@ -151,19 +151,19 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
@@ -406,10 +406,10 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -417,7 +417,7 @@
     <ClCompile Include="..\common\DemoTasks\SimpleHTTPSExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -493,26 +493,26 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
@@ -755,22 +755,22 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\common\mbedtls_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/demo_config.h
index 8ddc1fd93..8ddc1fd93 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/https_basic_tls_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/https_basic_tls_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/https_basic_tls_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/https_basic_tls_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/iot_config.h
index 4e69ce1c1..4e69ce1c1 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_basic_tls_server_auth/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_basic_tls_server_auth/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/FreeRTOSConfig.h
index 642113c41..642113c41 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/FreeRTOSIPConfig.h
index 96c93e394..96c93e394 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
index ee97efa04..ee97efa04 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/WIN32.vcxproj
index ee582d75b..8ab78d7da 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,14 +146,14 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -496,19 +496,19 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/WIN32.vcxproj.filters
index c74593e5d..c008b3050 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/WIN32.vcxproj.filters
@@ -151,19 +151,19 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
@@ -406,10 +406,10 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -417,7 +417,7 @@
     <ClCompile Include="..\common\DemoTasks\SimpleHTTPSExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -493,26 +493,26 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
@@ -755,22 +755,22 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\common\mbedtls_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/demo_config.h
index 6d638d792..6d638d792 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/https_tls_mutual_auth_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/https_tls_mutual_auth_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/https_tls_mutual_auth_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/https_tls_mutual_auth_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/iot_config.h
index 4e69ce1c1..4e69ce1c1 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/https_tls_mutual_auth/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/https_tls_mutual_auth/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/readme.txt
index 57fa35ccf..57fa35ccf 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/aws_iot_demo_profile.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/aws_iot_demo_profile.h
index 1ac70b8c4..1ac70b8c4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/aws_iot_demo_profile.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/aws_iot_demo_profile.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/aws_iot_setup_check.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/aws_iot_setup_check.h
index 7b25cec13..7b25cec13 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/aws_iot_setup_check.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/aws_iot_setup_check.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/https_demo_profile.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/https_demo_profile.h
index c4011a95c..c4011a95c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/https_demo_profile.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/https_demo_profile.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/mqtt_demo_profile.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/mqtt_demo_profile.h
index 2b70d5e5a..2b70d5e5a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/include/mqtt_demo_profile.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include/mqtt_demo_profile.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/DemoTasks/JobsNotifyNextExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/DemoTasks/JobsNotifyNextExamples.c
index 066098b01..066098b01 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/DemoTasks/JobsNotifyNextExamples.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/DemoTasks/JobsNotifyNextExamples.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/FreeRTOSConfig.h
index 642113c41..642113c41 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/FreeRTOSIPConfig.h
index 39a61856b..39a61856b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/READ_ME_INSTRUCTIONS.url
index 14aa2fd1b..14aa2fd1b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WIN32.vcxproj
index 4c76311e1..3a3f25a6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\include;..\..\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\include;..\..\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,29 +146,29 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_doc_parser.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_parser.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_static_memory.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_doc_parser.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_parser.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_static_memory.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -514,29 +514,29 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot_doc_parser.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\include\aws_iot_jobs.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\include\types\aws_iot_jobs_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\atomic.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_atomic.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_init.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_linear_containers.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging_setup.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot_doc_parser.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\include\aws_iot_jobs.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\include\types\aws_iot_jobs_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\atomic.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_atomic.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_init.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_linear_containers.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging_setup.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WIN32.vcxproj.filters
index 1c33de030..6ab8f9a83 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WIN32.vcxproj.filters
@@ -180,34 +180,34 @@
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
     <ClCompile Include="demo_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -447,46 +447,46 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_parser.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_parser.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_static_memory.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_static_memory.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\src\aws_iot_jobs_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\src\aws_iot_jobs_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\src</Filter>
     </ClCompile>
     <ClCompile Include="DemoTasks\JobsNotifyNextExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_doc_parser.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_doc_parser.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -562,35 +562,35 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="mbedtls_config.h" />
@@ -831,45 +831,45 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\include\types\aws_iot_jobs_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\include\types\aws_iot_jobs_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\jobs\include\aws_iot_jobs.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\jobs\include\aws_iot_jobs.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\jobs\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\atomic.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\atomic.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_atomic.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_atomic.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_init.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_init.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_linear_containers.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_linear_containers.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging_setup.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging_setup.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\aws_iot_demo_profile.h" />
     <ClInclude Include="..\..\include\aws_iot_setup_check.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot_doc_parser.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot_doc_parser.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\include</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/netif.h
index 7b3e9cd3c..7b3e9cd3c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/atomic.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/atomic.h
index d9b063bf8..d9b063bf8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/atomic.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/atomic.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_config.h
index f08a98f27..f08a98f27 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_logging.c
index 3c46ff835..3c46ff835 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_logging.h
index 2cc068ce9..2cc068ce9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/iot_config.h
index 5ff1bcc2a..5ff1bcc2a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/jobs_notify_next_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/jobs_notify_next_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/jobs_notify_next_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/jobs_notify_next_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/main.c
index 5b19167f4..5b19167f4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/mbedtls_config.h
index 0b2d27a0c..0b2d27a0c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/printf-stdarg.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/printf-stdarg.c
index 84b87b2a4..84b87b2a4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/jobs_notify_next/printf-stdarg.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/jobs_notify_next/printf-stdarg.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/readme.txt
index 4a144a6f7..4a144a6f7 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/DemoTasks/LightWeightMQTTExample.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/DemoTasks/LightWeightMQTTExample.c
index 1d4cbd916..1d4cbd916 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/DemoTasks/LightWeightMQTTExample.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/DemoTasks/LightWeightMQTTExample.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/DemoTasks/SimpleMQTTExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/DemoTasks/SimpleMQTTExamples.c
new file mode 100755
index 000000000..2ec2e10aa
--- /dev/null
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/DemoTasks/SimpleMQTTExamples.c
@@ -0,0 +1,631 @@
+/*
+ * FreeRTOS Kernel V10.3.0
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * http://www.FreeRTOS.org
+ * http://aws.amazon.com/freertos
+ *
+ * 1 tab == 4 spaces!
+ */
+
+/*
+ * This file contains the common functions for plain text, basic TLS, and mutual
+ * authentication MQTT demos. Aside from the difference in security level during
+ * connect, the three demos perform the same interaction with a MQTT broker. The
+ * demos create a single application task that connects to a MQTT broker,
+ * subscribes to a topic, publishes a topic with a message, and disconnect from a
+ * MQTT broker. The task subscribes to the same topic it publishes to, receiving
+ * the message it sends to the broker. Note that this demo does not terminate, the
+ * connect-subscribe-publish-disconnect cycle is repeated for unlimited number of
+ * times.
+ *
+ * The plain text MQTT demo does not authenticate the server nor the client. The
+ * basic TLS MQTT demo builds on top of the plain text demo, adding broker
+ * authentication and encryption. The mutual authentication MQTT demo builds on top
+ * of the basic TLS demo, enabling both server and client authentication.
+ *
+ * For more information regarding the MQTT library and the demo, please refer to:
+ * https://freertos.org/mqtt/index.html
+ */
+
+/* Standard includes. */
+#include <string.h>
+#include <stdio.h>
+
+/* Kernel includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* FreeRTOS+TCP includes. */
+#include "FreeRTOS_IP.h"
+
+/* IoT SDK includes. */
+#include "iot_mqtt.h"
+#include "platform/iot_network_freertos.h"
+
+/* MQTT Demo Select */
+#include "demo_config.h"
+
+/* Select MQTT profile based on the setting in demo_config.h */
+#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
+    #include "aws_iot_demo_profile.h"
+#else
+    #include "mqtt_demo_profile.h"
+#endif
+
+/* Preprocessor check for configuration */
+#include "aws_iot_setup_check.h"
+
+/*
+ * Set connection profile based on the setting in demo_config.h. For more
+ * information on each variable, please refer to the respective *_profile.h
+ * file in FreeRTOS-Labs\Demo\FreeRTOS-IoT-Libraries-LTS-Beta1\include.
+ *
+ * Note that if you are running mqtt_tls_mutual_auth demo please make sure to
+ * visit the following link for setup:
+ * https://www.freertos.org/mqtt/preconfiguredexamplesMA.html
+ */
+#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
+    #define mqttexampleBROKER_ENDPOINT           awsiotdemoprofileAWS_ENDPOINT
+    #define mqttexampleBROKER_PORT               awsiotdemoprofileAWS_MQTT_PORT
+    #define mqttexampleBROKER_CERTIFICATE_PEM    awsiotdemoprofileAWS_CERTIFICATE_PEM
+    #define mqttexampleCLIENT_IDENTIFIER         awsiotdemoprofileCLIENT_IDENTIFIER
+    #define mqttexampleCLIENT_CERTIFICATE_PEM    awsiotdemoprofileCLIENT_CERTIFICATE_PEM
+    #define mqttexampleCLIENT_PRIVATE_KEY_PEM    awsiotdemoprofileCLIENT_PRIVATE_KEY_PEM
+#else
+    #define mqttexampleBROKER_ENDPOINT           mqttdemoprofileBROKER_ENDPOINT
+    #define mqttexampleBROKER_PORT               mqttdemoprofileBROKER_PORT
+    #define mqttexampleBROKER_CERTIFICATE_PEM    mqttdemoprofileBROKER_CERTIFICATE_PEM
+    #define mqttexampleCLIENT_IDENTIFIER         mqttdemoprofileCLIENT_IDENTIFIER
+#endif /* if ( democonfigPROFILE_USE_AWS_IOT == pdTRUE ) */
+
+/**
+ * @brief The keep-alive interval used for this example.
+ *
+ * An MQTT ping request will be sent periodically at this interval.
+ *
+ * @note: This value is set to zero to disable MQTT
+ * keep alive for the Windows simulator project.
+ * The FreeRTOS kernel does not accurately calculate time for the Windows
+ * Simulator. Therefore, MQTT PING Request messages may be sent
+ * at an incorrect time interval to the broker. If the broker does
+ * not receive a ping request within 1.5x the time sent in a
+ * connection request, the broker may close the connection.
+ * To enable the keep alive feature, set this value
+ * to the desired interval in seconds.
+ */
+#define mqttexampleKEEP_ALIVE_SECONDS      ( 0 )
+
+/**
+ * @brief The timeout for MQTT operations in this example.
+ *
+ * When passed to an MQTT API, this timeout is used only to measure the time it
+ * takes for the MQTT broker to acknowledge an MQTT message. It is not used to
+ * measure the total execution time of the API.
+ *
+ * For example, when IotMqtt_Connect API is called, MQTT CONNECT message is sent
+ * to the broker. If the CONNACK message is not received from the broker in
+ * mqttexampleMQTT_TIMEOUT_MS, the IotMqtt_Connect API will timeout and return
+ * IOT_MQTT_TIMEOUT.
+ */
+#define mqttexampleMQTT_TIMEOUT_MS         ( 5000 )
+
+/**
+ * @brief The topic to subscribe and publish to in the example.
+ *
+ * The topic starts with the client identifier to ensure that each demo interacts
+ * with a unique topic.
+ */
+#define mqttexampleTOPIC                   mqttexampleCLIENT_IDENTIFIER "/example/topic"
+
+/**
+ * @brief The MQTT message published in this example.
+ */
+#define mqttexampleMESSAGE                 "Hello World!"
+
+/**
+ * @brief Parameters to control the retry behavior in case a QoS1 publish
+ * message gets lost.
+ *
+ * Retry every minutes up to a maximum of 5 retries.
+ */
+#define mqttexamplePUBLISH_RETRY_MS        ( 1000 )
+#define mqttexamplePUBLISH_RETRY_LIMIT     ( 5 )
+
+/**
+ * @brief The bit which is set in the demo task's notification value from the
+ * disconnect callback to inform the demo task about the MQTT disconnect.
+ */
+#define mqttexampleDISCONNECTED_BIT        ( 1UL << 0UL )
+
+/**
+ * @brief The bit which is set in the demo task's notification value from the
+ * publish callback to inform the demo task about the message received from the
+ * MQTT broker.
+ */
+#define mqttexampleMESSAGE_RECEIVED_BIT    ( 1UL << 1UL )
+
+/*-----------------------------------------------------------*/
+
+/**
+ * @brief The task used to demonstrate the MQTT API.
+ *
+ * @param[in] pvParameters Parameters as passed at the time of task creation. Not
+ * used in this example.
+ */
+static void prvMQTTDemoTask( void * pvParameters );
+
+/**
+ * @brief The callback invoked by the MQTT library when the MQTT connection gets
+ * disconnected.
+ *
+ * @param[in] pvCallbackContext Callback context as provided at the time of
+ * connect.
+ * @param[in] pxCallbackParams Contains the reason why the MQTT connection was
+ * disconnected.
+ */
+static void prvExample_OnDisconnect( void * pvCallbackContext,
+                                     IotMqttCallbackParam_t * pxCallbackParams );
+
+/**
+ * @brief The callback invoked by the MQTT library when a message is received on
+ * a subscribed topic from the MQTT broker.
+ *
+ * @param[in] pvCallbackContext Callback context as provided at the time of
+ * subscribe.
+ * @param[in] pxCallbackParams Contain the details about the received message -
+ * topic on which the message was received, the received message.
+ */
+static void prvExample_OnMessageReceived( void * pvCallbackContext,
+                                          IotMqttCallbackParam_t * pxCallbackParams );
+
+/**
+ * @brief Connects to the MQTT broker as specified in mqttexampleBROKER_ENDPOINT
+ * and mqttexampleBROKER_PORT.
+ */
+static void prvMQTTConnect( void );
+
+/**
+ * @brief Subscribes to the topic as specified in mqttexampleTOPIC.
+ */
+static void prvMQTTSubscribe( void );
+
+/**
+ * @brief Publishes a messages mqttexampleMESSAGE on mqttexampleTOPIC topic.
+ */
+static void prvMQTTPublish( void );
+
+/**
+ * @brief Unsubscribes from the mqttexampleTOPIC topic.
+ */
+static void prvMQTTUnsubscribe( void );
+
+/**
+ * @brief Disconnects from the MQTT broker gracefully by sending an MQTT
+ * DISCONNECT message.
+ */
+static void prvMQTTDisconnect( void );
+
+/**
+ * @brief Initializes the IoT libraries used by this demo.
+ */
+static void prvInitialiseLibraries( void );
+
+/**
+ * @brief The MQTT connection handle used in this example.
+ */
+static IotMqttConnection_t xMQTTConnection = IOT_MQTT_CONNECTION_INITIALIZER;
+
+/*-----------------------------------------------------------*/
+
+static const struct IotNetworkServerInfo xMQTTBrokerInfo =
+{
+    .pHostName = mqttexampleBROKER_ENDPOINT,
+    .port      = mqttexampleBROKER_PORT
+};
+
+#if ( democonfigENABLE_TLS )
+    static struct IotNetworkCredentials xNetworkSecurityCredentials =
+    {
+        /* Optional TLS extensions. For this demo, they are disabled. */
+        .pAlpnProtos        = NULL,
+        .maxFragmentLength  = 0,
+
+        /* SNI is enabled by default. */
+        .disableSni         = false,
+
+        /* Provide the certificate for validating the server. Only required for
+         * demos using TLS. */
+        .pRootCa            = mqttexampleBROKER_CERTIFICATE_PEM,
+        .rootCaSize         = sizeof( mqttexampleBROKER_CERTIFICATE_PEM ),
+
+        /* Strong mutual authentication to authenticate both the broker and
+         * the client. */
+        #if ( democonfigENABLE_MUTUAL_AUTH )
+            .pClientCert    = mqttexampleCLIENT_CERTIFICATE_PEM,
+            .clientCertSize = sizeof( mqttexampleCLIENT_CERTIFICATE_PEM ),
+            .pPrivateKey    = mqttexampleCLIENT_PRIVATE_KEY_PEM,
+            .privateKeySize = sizeof( mqttexampleCLIENT_PRIVATE_KEY_PEM )
+        #else
+               .pClientCert = NULL,
+            .clientCertSize = 0,
+            .pPrivateKey    = NULL,
+            .privateKeySize = 0
+                              #endif /* if ( democonfigENABLE_MUTUAL_AUTH ) */
+    };
+#endif /* if ( democonfigENABLE_TLS ) */
+
+static IotMqttNetworkInfo_t xNetworkInfo =
+{
+    /* No connection to the MQTT broker has been established yet and we want to
+     * establish a new connection. */
+    .createNetworkConnection            = true,
+    .u.setup.pNetworkServerInfo         = &( xMQTTBrokerInfo ),
+
+    /* Set the TLS credentials for the new MQTT connection. This member is NULL
+     * for the plain text MQTT demo. */
+    #if ( democonfigENABLE_TLS )
+        .u.setup.pNetworkCredentialInfo = &xNetworkSecurityCredentials,
+    #else
+        .u.setup.pNetworkCredentialInfo = NULL, /* Not using TLS so no credentials. */
+    #endif
+
+    /* Use FreeRTOS+TCP network interface. */
+    .pNetworkInterface                  = IOT_NETWORK_INTERFACE_FREERTOS,
+
+    /* Setup the callback which is called when the MQTT connection is
+     * disconnected. The task handle is passed as the callback context which
+     * is used by the callback to send a task notification to this task.*/
+    .disconnectCallback.function        = prvExample_OnDisconnect
+};
+
+static const IotMqttConnectInfo_t xConnectInfo =
+{
+    /* Set this flag to true if connecting to the AWS IoT MQTT broker. */
+    #if ( democonfigPROFILE_USE_AWS_IOT == 1 )
+        .awsIotMqttMode        = true,
+    #else
+        .awsIotMqttMode        = false,
+    #endif
+
+    /* Start with a clean session i.e. direct the MQTT broker to discard any
+     * previous session data. Also, establishing a connection with clean session
+     * will ensure that the broker does not store any data when this client
+     * gets disconnected. */
+    .cleanSession              = true,
+
+    /* Since we are starting with a clean session, there are no previous
+     * subscriptions to be restored. */
+    .pPreviousSubscriptions    = NULL,
+    .previousSubscriptionCount = 0,
+
+    /* We do not want to publish Last Will and Testament (LWT) message if the
+     * client gets disconnected. */
+    .pWillInfo                 = NULL,
+
+    /* Send an MQTT PING request every minute to keep the connection open if
+     * there is no other MQTT traffic. */
+    .keepAliveSeconds          = mqttexampleKEEP_ALIVE_SECONDS,
+
+    /* The client identifier is used to uniquely identify this MQTT client to
+     * the MQTT broker.  In a production device the identifier can be something
+     * unique, such as a device serial number. */
+    .pClientIdentifier         = mqttexampleCLIENT_IDENTIFIER,
+    .clientIdentifierLength    = ( uint16_t ) sizeof( mqttexampleCLIENT_IDENTIFIER ) - 1,
+
+    /* This example does not authenticate the client and therefore username and
+     * password fields are not used. */
+    .pUserName                 = NULL,
+    .userNameLength            = 0,
+    .pPassword                 = NULL,
+    .passwordLength            = 0
+};
+/*-----------------------------------------------------------*/
+
+
+void vStartSimpleMQTTDemo( void )
+{
+    TickType_t xShortDelay = ( TickType_t ) pdMS_TO_TICKS( ( TickType_t ) 500 );
+
+    /* Wait a short time to allow receipt of the ARP replies. */
+    vTaskDelay( xShortDelay );
+
+    /* This example uses a single application task, which in turn is used to
+     * connect, subscribe, publish, unsubscribe and disconnect from the MQTT
+     * broker. */
+    xTaskCreate( prvMQTTDemoTask,          /* Function that implements the task. */
+                 "MQTTDemo",               /* Text name for the task - only used for debugging. */
+                 democonfigDEMO_STACKSIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
+                 NULL,                     /* Task parameter - not used in this case. */
+                 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
+                 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTDemoTask( void * pvParameters )
+{
+    uint32_t ulNotificationValue = 0, ulPublishCount;
+    const uint32_t ulMaxPublishCount = 5UL;
+    const TickType_t xNoDelay = ( TickType_t ) 0;
+
+    /* Remove compiler warnings about unused parameters. */
+    ( void ) pvParameters;
+
+    /* One time initialization of the libraries used by this demo. */
+    prvInitialiseLibraries();
+
+    for( ; ; )
+    {
+        /* Notifications are used to send events from the callback functions to this
+         * task.  Don't expect any notifications to be pending at the beginning of the
+         * loop. */
+        configASSERT( ulTaskNotifyTake( pdTRUE, xNoDelay ) == 0 );
+
+
+        /****************************** Connect. ******************************/
+
+        /* Establish a connection to the MQTT broker. This example connects to
+         * the MQTT broker as specified by the compile time constants
+         * mqttexampleBROKER_ENDPOINT and mqttexampleBROKER_PORT.
+         * Please change it to the MQTT broker you want to connect to. */
+        configPRINTF( ( "Attempt to connect to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+        prvMQTTConnect();
+        configPRINTF( ( "Connected to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+
+
+        /**************************** Subscribe. ******************************/
+
+        /* The client is now connected to the broker. Subscribe to the topic
+         * as specified by the mqttexampleTOPIC compile time constant.  This
+         * client will then publish to the same topic it subscribed to, so will
+         * expect all the messages it sends to the broker to be sent back to it
+         * from the broker. */
+        configPRINTF( ( "Attempt to subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
+        prvMQTTSubscribe();
+        configPRINTF( ( "Subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
+
+
+        /*********************** Publish ulMaxPublishCount messages. **********/
+
+        /* Publish a few messages while connected. */
+        for( ulPublishCount = 0; ulPublishCount < ulMaxPublishCount; ulPublishCount++ )
+        {
+            /* Publish a message on the topic specified by the mqttexampleTOPIC
+             * compile time constant. */
+            configPRINTF( ( "Publish %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+            prvMQTTPublish();
+            configPRINTF( ( "Published %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+
+            /* Since we are subscribed to the same topic as we published on, we
+             * will get the same message back from the MQTT broker. Wait for the
+             * message to be received which is signaled to us by the publish
+             * callback (prvExample_OnMessageReceived) setting the
+             * mqttexampleMESSAGE_RECEIVED_BIT bit in this task's notification
+             * value. Note the bit is then cleared in the task's notification value
+             * to ensure the bit being set can be detected on the next iteration. */
+            xTaskNotifyWait( 0UL,                             /* Don't clear any bits on entry. */
+                             mqttexampleMESSAGE_RECEIVED_BIT, /* Clear bit on exit. */
+                             &( ulNotificationValue ),        /* Obtain the notification value. */
+                             pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+            configASSERT( ( ulNotificationValue & mqttexampleMESSAGE_RECEIVED_BIT ) == mqttexampleMESSAGE_RECEIVED_BIT );
+        }
+
+        /******************* Unsubscribe and Disconnect. **********************/
+
+        /* Unsubscribe from the topic mqttexampleTOPIC and disconnect
+         * gracefully. */
+        prvMQTTUnsubscribe();
+        prvMQTTDisconnect();
+        configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+
+        /* Wait for the disconnect operation to complete which is signaled to us
+         * by the disconnect callback (prvExample_OnDisconnect)by setting
+         * the mqttexampleDISCONNECTED_BIT bit in this task's notification value.
+         * Note the bit is cleared in the task's notification value again to ensure
+         * it being set can be detected again on the next iteration. */
+        xTaskNotifyWait( 0UL,                         /* Don't clear any bits on entry. */
+                         mqttexampleDISCONNECTED_BIT, /* Clear bit on exit. */
+                         &( ulNotificationValue ),    /* Obtain the notification value. */
+                         pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+        configASSERT( ( ulNotificationValue & mqttexampleDISCONNECTED_BIT ) == mqttexampleDISCONNECTED_BIT );
+
+        /* Delay between iterations to avoid broker throttling. */
+        configPRINTF( ( "prvMQTTDemoTask() completed an iteration successfully. Total free heap is %u\r\n", xPortGetFreeHeapSize() ) );
+        configPRINTF( ( "Demo completed successfully.\r\n" ) );
+        configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
+        vTaskDelay( pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+    }
+}
+/*-----------------------------------------------------------*/
+
+static void prvExample_OnDisconnect( void * pvCallbackContext,
+                                     IotMqttCallbackParam_t * pxCallbackParams )
+{
+    TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
+
+    /* Ensure that we initiated the disconnect. */
+    configASSERT( pxCallbackParams->u.disconnectReason == IOT_MQTT_DISCONNECT_CALLED );
+
+    /* Inform the demo task about the disconnect. */
+    xTaskNotify( xDemoTaskHandle,
+                 mqttexampleDISCONNECTED_BIT,
+                 eSetBits /* Set the mqttexampleDISCONNECTED_BIT in the demo task's notification value. */
+                 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvExample_OnMessageReceived( void * pvCallbackContext,
+                                          IotMqttCallbackParam_t * pxCallbackParams )
+{
+    TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
+
+    /* Ensure the message is received on the expected topic. */
+    configASSERT( pxCallbackParams->u.message.info.topicNameLength == strlen( mqttexampleTOPIC ) );
+    configASSERT( strncmp( pxCallbackParams->u.message.info.pTopicName,
+                           mqttexampleTOPIC,
+                           strlen( mqttexampleTOPIC ) ) == 0 );
+
+    /* Ensure the message itself is as expected. */
+    configASSERT( pxCallbackParams->u.message.info.payloadLength == strlen( mqttexampleMESSAGE ) );
+    configASSERT( strncmp( pxCallbackParams->u.message.info.pPayload,
+                           mqttexampleMESSAGE,
+                           strlen( mqttexampleMESSAGE ) ) == 0 );
+
+    /* Ensure the message Quality of Service (QoS) is as expected. */
+    configASSERT( pxCallbackParams->u.message.info.qos == IOT_MQTT_QOS_1 );
+
+    /* So as not to worry about string lengths the print message uses the
+     * consts rather than the data from the message, but the asserts above have
+     * already checked the two are equal. */
+    configPRINTF( ( "Received %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+
+    /* Inform the demo task about the message received from the MQTT broker by
+     * setting the mqttexampleMESSAGE_RECEIVED_BIT bit in the task's notification
+     * value. */
+    xTaskNotify( xDemoTaskHandle,
+                 mqttexampleMESSAGE_RECEIVED_BIT,
+                 eSetBits /* Set the mqttexampleMESSAGE_RECEIVED_BIT in the demo task's notification value. */
+                 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTConnect( void )
+{
+    IotMqttError_t xResult;
+
+    /* Set the context to pass into the disconnect callback function. */
+    xNetworkInfo.disconnectCallback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
+
+    /* Establish the connection to the MQTT broker - It is a blocking call and
+     * will return only when connection is complete or a timeout occurs.  The
+     * network and connection structures are declared and initialized at the top
+     * of this file. */
+    xResult = IotMqtt_Connect( &( xNetworkInfo ),
+                               &( xConnectInfo ),
+                               mqttexampleMQTT_TIMEOUT_MS,
+                               &( xMQTTConnection ) );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTDisconnect( void )
+{
+    /* Send a MQTT DISCONNECT packet to the MQTT broker to do a graceful
+     * disconnect. */
+    IotMqtt_Disconnect( xMQTTConnection,
+                        0 /* flags - 0 means a graceful disconnect by sending MQTT DISCONNECT. */
+                        );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTSubscribe( void )
+{
+    IotMqttError_t xResult;
+    IotMqttSubscription_t xMQTTSubscription;
+
+    /* Subscribe to the mqttexampleTOPIC topic filter. The task handle is passed
+     * as the callback context, which is then used by the callback to send a task
+     * notification to this task.*/
+    xMQTTSubscription.qos = IOT_MQTT_QOS_1;
+    xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
+    xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+    xMQTTSubscription.callback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
+    xMQTTSubscription.callback.function = prvExample_OnMessageReceived;
+
+    /* Use the synchronous API to subscribe - It is a blocking call and only
+     * returns when the subscribe operation is complete or a timeout occurs. */
+    xResult = IotMqtt_SubscribeSync( xMQTTConnection,
+                                     &( xMQTTSubscription ),
+                                     1, /* We are subscribing to one topic filter. */
+                                     0, /* flags - currently ignored. */
+                                     mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTPublish( void )
+{
+    IotMqttError_t xResult;
+    IotMqttPublishInfo_t xMQTTPublishInfo;
+
+    /* Publish a message with QoS1 on the mqttexampleTOPIC topic. Since we are
+     * subscribed to the same topic, the MQTT broker will send the same message
+     * back to us. It is verified in the publish callback. */
+    xMQTTPublishInfo.qos = IOT_MQTT_QOS_1;
+    xMQTTPublishInfo.retain = false;
+    xMQTTPublishInfo.pTopicName = mqttexampleTOPIC;
+    xMQTTPublishInfo.topicNameLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+    xMQTTPublishInfo.pPayload = mqttexampleMESSAGE;
+    xMQTTPublishInfo.payloadLength = strlen( mqttexampleMESSAGE );
+    xMQTTPublishInfo.retryMs = mqttexamplePUBLISH_RETRY_MS;
+    xMQTTPublishInfo.retryLimit = mqttexamplePUBLISH_RETRY_LIMIT;
+
+    /* Use the synchronous API to publish - It is a blocking call and only
+     * returns when the publish operation is complete or a timeout occurs. */
+    xResult = IotMqtt_PublishSync( xMQTTConnection,
+                                   &( xMQTTPublishInfo ),
+                                   0, /* flags - currently ignored. */
+                                   mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTUnsubscribe( void )
+{
+    IotMqttError_t xResult;
+    IotMqttSubscription_t xMQTTSubscription;
+
+    /* Unsubscribe from the mqttexampleTOPIC topic filter. */
+    xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
+    xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+
+    /* The following members of the IotMqttSubscription_t are ignored by the
+     * unsubscribe operation. Just initialize them to avoid "use of uninitialized
+     * variable" warnings. */
+    xMQTTSubscription.qos = IOT_MQTT_QOS_1;
+    xMQTTSubscription.callback.pCallbackContext = NULL;
+    xMQTTSubscription.callback.function = NULL;
+
+    /* Use the synchronous API to unsubscribe - It is a blocking call and only
+     * returns when the unsubscribe operation is complete or a timeout occurs. */
+    xResult = IotMqtt_UnsubscribeSync( xMQTTConnection,
+                                       &( xMQTTSubscription ),
+                                       1, /* We are unsubscribing from one topic filter. */
+                                       0, /* flags - currently ignored. */
+                                       mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvInitialiseLibraries( void )
+{
+    IotMqttError_t xResult;
+    IotNetworkError_t xNetworkResult;
+
+    /* Initialize the network stack abstraction for FreeRTOS. */
+    xNetworkResult = IotNetworkFreeRTOS_Init();
+    configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
+
+    /* MQTT library must be initialized before it can be used. This is just one
+     * time initialization. */
+    xResult = IotMqtt_Init();
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/Run-time-stats-utils.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/Run-time-stats-utils.c
index 0b2388f93..0b2388f93 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/Run-time-stats-utils.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/Run-time-stats-utils.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/netif.h
index 7b3e9cd3c..7b3e9cd3c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/atomic.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/atomic.h
index d9b063bf8..d9b063bf8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/atomic.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/atomic.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/demo_logging.c
index 3c46ff835..3c46ff835 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/demo_logging.h
index 2cc068ce9..2cc068ce9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/main.c
index 2b6d66739..2b6d66739 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/mbedtls_config.h
index 0b2d27a0c..0b2d27a0c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/printf-stdarg.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/printf-stdarg.c
index 84b87b2a4..84b87b2a4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/printf-stdarg.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/common/printf-stdarg.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/FreeRTOSConfig.h
index 642113c41..642113c41 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/FreeRTOSIPConfig.h
index e02b16b66..e02b16b66 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
index 7f0aa1829..7f0aa1829 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj
index c3f4d5818..0db6b9f86 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,19 +146,19 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -500,20 +500,20 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj.filters
index 5e2922889..83910f643 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/WIN32.vcxproj.filters
@@ -148,34 +148,34 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -415,7 +415,7 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -423,10 +423,10 @@
     <ClCompile Include="..\common\DemoTasks\SimpleMQTTExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -502,29 +502,29 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">
@@ -764,23 +764,23 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
     <ClInclude Include="..\common\mbedtls_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\mqtt_demo_profile.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/demo_config.h
index 6343f7772..6343f7772 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/iot_config.h
index 3d74a285e..3d74a285e 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/mqtt_basic_tls_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/mqtt_basic_tls_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_basic_tls_server_auth/mqtt_basic_tls_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_basic_tls_server_auth/mqtt_basic_tls_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/FreeRTOSConfig.h
index b0a542f02..b0a542f02 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/FreeRTOSIPConfig.h
index 1adbb82b2..1adbb82b2 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/READ_ME_INSTRUCTIONS.url
index 7f0aa1829..7f0aa1829 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/WIN32.vcxproj
index a6041c36e..dd858def7 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -146,18 +146,18 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\stream_buffer.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -186,19 +186,19 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-     <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+     <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/WIN32.vcxproj.filters
index f7f5d3314..92633cd2b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/WIN32.vcxproj.filters
@@ -139,34 +139,34 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\FreeRTOS-Plus-Trace\trcKernelPort.c">
@@ -184,10 +184,10 @@
     <ClCompile Include="..\common\DemoTasks\SimpleMQTTExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -263,44 +263,44 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/demo_config.h
index 713edfb38..713edfb38 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/iot_config.h
index ecb651624..ecb651624 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/mqtt_plain_text_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/mqtt_plain_text_demo.sln
index dcfc1fe09..dcfc1fe09 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/mqtt_plain_text_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/mqtt_plain_text_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/trcConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/trcConfig.h
index f4c7ffe24..f4c7ffe24 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/trcConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/trcConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/trcSnapshotConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/trcSnapshotConfig.h
index 9ccb32d47..9ccb32d47 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_plain_text/trcSnapshotConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_plain_text/trcSnapshotConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/FreeRTOSConfig.h
index 642113c41..642113c41 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
index 39a61856b..39a61856b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
index 7f0aa1829..7f0aa1829 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj
index c2affd6c0..4e8a3100b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,19 +146,19 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -500,20 +500,20 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj.filters
index b131763c1..4b8119d93 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/WIN32.vcxproj.filters
@@ -148,34 +148,34 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -415,7 +415,7 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -423,10 +423,10 @@
     <ClCompile Include="..\common\DemoTasks\SimpleMQTTExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -502,29 +502,29 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">
@@ -764,23 +764,23 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
     <ClInclude Include="..\common\mbedtls_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\aws_iot_demo_profile.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/demo_config.h
index 3a1cfdad0..3a1cfdad0 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/iot_config.h
index 03ed26deb..03ed26deb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/mqtt_tls_mutual_auth_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/mqtt_tls_mutual_auth_demo.sln
index 7bdad6f2d..7bdad6f2d 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/mqtt_tls_mutual_auth_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/mqtt_tls_mutual_auth_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/readme.txt
index 7324dc121..7324dc121 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/mqtt_tls_mutual_auth/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/mqtt_tls_mutual_auth/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/readme.txt
index 8c3630b71..8c3630b71 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/DemoTasks/aws_iot_ota_update_demo.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/DemoTasks/aws_iot_ota_update_demo.c
index bf937fa20..bf937fa20 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/DemoTasks/aws_iot_ota_update_demo.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/DemoTasks/aws_iot_ota_update_demo.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/netif.h
index ab3659272..ab3659272 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_application_version.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_application_version.h
index afc9ae3a2..afc9ae3a2 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_application_version.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_application_version.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_demo_version.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_demo_version.c
index 215a4b67e..215a4b67e 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_demo_version.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_demo_version.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_ota_pal.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_ota_pal.c
index 2ff302c55..2ff302c55 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/aws_ota_pal.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/aws_ota_pal.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/demo_logging.c
index 3c46ff835..3c46ff835 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/demo_logging.h
index 2cc068ce9..2cc068ce9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_appversion32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_appversion32.h
index 26408d0ef..26408d0ef 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_appversion32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_appversion32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_crypto.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_crypto.c
index 53f6830cf..53f6830cf 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_crypto.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_crypto.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_crypto.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_crypto.h
index 0d866c079..0d866c079 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/iot_crypto.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/iot_crypto.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/main.c
index ddde0132a..ddde0132a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/mbedtls_config.h
index f8a43cb64..f8a43cb64 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/common/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/common/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/FreeRTOSConfig.h
index fcef78a98..fcef78a98 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/FreeRTOSIPConfig.h
index 7ce865d71..7ce865d71 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/WIN32.vcxproj
index 43676dc32..d1a60918b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -119,7 +119,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -147,28 +147,28 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -286,34 +286,34 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/WIN32.vcxproj.filters
index 8b28e6c4c..2163372c8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/WIN32.vcxproj.filters
@@ -184,25 +184,25 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -213,19 +213,19 @@
     <ClCompile Include="..\common\aws_demo_version.c" />
     <ClCompile Include="..\common\aws_ota_pal.c" />
     <ClCompile Include="..\common\iot_crypto.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\tinycbor\cborencoder.c">
@@ -255,22 +255,22 @@
     <ClCompile Include="..\..\..\..\Source\jsmn\jsmn.c">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -510,19 +510,19 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
   </ItemGroup>
@@ -598,50 +598,50 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
@@ -649,31 +649,31 @@
     <ClInclude Include="..\common\iot_appversion32.h" />
     <ClInclude Include="..\common\iot_crypto.h" />
     <ClInclude Include="..\common\mbedtls_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
     <ClInclude Include="aws_ota_codesigner_certificate.h" />
@@ -697,16 +697,16 @@
     <ClInclude Include="..\..\..\..\Source\jsmn\jsmn.h">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">
@@ -946,7 +946,7 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
     <ClInclude Include="aws_ota_agent_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/aws_ota_agent_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/aws_ota_agent_config.h
index c08c203c3..c08c203c3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/aws_ota_agent_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/aws_ota_agent_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/aws_ota_codesigner_certificate.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/aws_ota_codesigner_certificate.h
index 586fb2882..586fb2882 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/aws_ota_codesigner_certificate.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/aws_ota_codesigner_certificate.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/demo_config.h
index 30ee2cb28..30ee2cb28 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/iot_config.h
index 8ed948a49..8ed948a49 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/ota_code_signing.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/ota_code_signing.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/ota_code_signing.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing/ota_code_signing.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/FreeRTOSConfig.h
index fcef78a98..fcef78a98 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/FreeRTOSIPConfig.h
index 7ce865d71..7ce865d71 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/WIN32.vcxproj
index 43676dc32..d1a60918b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -119,7 +119,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -147,28 +147,28 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -286,34 +286,34 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/WIN32.vcxproj.filters
index 8b28e6c4c..2163372c8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/WIN32.vcxproj.filters
@@ -184,25 +184,25 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -213,19 +213,19 @@
     <ClCompile Include="..\common\aws_demo_version.c" />
     <ClCompile Include="..\common\aws_ota_pal.c" />
     <ClCompile Include="..\common\iot_crypto.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\tinycbor\cborencoder.c">
@@ -255,22 +255,22 @@
     <ClCompile Include="..\..\..\..\Source\jsmn\jsmn.c">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -510,19 +510,19 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
   </ItemGroup>
@@ -598,50 +598,50 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
@@ -649,31 +649,31 @@
     <ClInclude Include="..\common\iot_appversion32.h" />
     <ClInclude Include="..\common\iot_crypto.h" />
     <ClInclude Include="..\common\mbedtls_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
     <ClInclude Include="aws_ota_codesigner_certificate.h" />
@@ -697,16 +697,16 @@
     <ClInclude Include="..\..\..\..\Source\jsmn\jsmn.h">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">
@@ -946,7 +946,7 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
     <ClInclude Include="aws_ota_agent_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/aws_ota_agent_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/aws_ota_agent_config.h
index 85e7bae3d..85e7bae3d 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/aws_ota_agent_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/aws_ota_agent_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/aws_ota_codesigner_certificate.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/aws_ota_codesigner_certificate.h
index 586fb2882..586fb2882 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/aws_ota_codesigner_certificate.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/aws_ota_codesigner_certificate.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/demo_config.h
index 30ee2cb28..30ee2cb28 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/iot_config.h
index 8ed948a49..8ed948a49 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/ota_code_signing_http.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/ota_code_signing_http.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_code_signing_http/ota_code_signing_http.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_code_signing_http/ota_code_signing_http.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/FreeRTOSConfig.h
index fcef78a98..fcef78a98 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/FreeRTOSIPConfig.h
index 7ce865d71..7ce865d71 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/WIN32.vcxproj
index db0cd0aac..a3f72adef 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\common;..\common\WinPCap;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include;..\..\..\..\Source\http-parser;..\..\..\..\Source\mbedtls\include;..\..\..\..\Source\tinycbor;..\..\..\..\Source\jsmn;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -119,7 +119,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -147,28 +147,28 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -286,34 +286,34 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/WIN32.vcxproj.filters
index fc40ddfe0..5224e3736 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/WIN32.vcxproj.filters
@@ -184,25 +184,25 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_client.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_client.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\src\iot_https_utils.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\src\iot_https_utils.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\http-parser\http_parser.c">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
     <ClCompile Include="..\common\demo_logging.c" />
@@ -213,19 +213,19 @@
     <ClCompile Include="..\common\aws_demo_version.c" />
     <ClCompile Include="..\common\aws_ota_pal.c" />
     <ClCompile Include="..\common\iot_crypto.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\tinycbor\cborencoder.c">
@@ -255,22 +255,22 @@
     <ClCompile Include="..\..\..\..\Source\jsmn\jsmn.c">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -510,19 +510,19 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_lightweight_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_static_memory.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
   </ItemGroup>
@@ -598,50 +598,50 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\iot_taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\types\iot_taskpool_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\private\iot_taskpool_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\iot_https_client.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\iot_https_client.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\https\include\types\iot_https_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\https\include\types\iot_https_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\https\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\http-parser\http_parser.h">
       <Filter>FreeRTOS+\http-parser</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>
     </ClInclude>
     <ClInclude Include="demo_config.h" />
@@ -649,31 +649,31 @@
     <ClInclude Include="..\common\iot_appversion32.h" />
     <ClInclude Include="..\common\iot_crypto.h" />
     <ClInclude Include="..\common\mbedtls_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_agent_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_interface.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\aws_iot_ota_pal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_cbor_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\mqtt\aws_iot_ota_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\src\http\aws_iot_ota_http.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\src\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_agent.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\ota\include\aws_iot_ota_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\ota\include\aws_iot_ota_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\ota\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\aws_iot_demo_profile.h" />
@@ -696,16 +696,16 @@
     <ClInclude Include="..\..\..\..\Source\jsmn\jsmn.h">
       <Filter>FreeRTOS+\jsmn</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\private\iot_mqtt_internal.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_serialize.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">
@@ -945,7 +945,7 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
     <ClInclude Include="aws_ota_agent_config.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/aws_ota_agent_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/aws_ota_agent_config.h
index 2039ebea0..2039ebea0 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/aws_ota_agent_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/aws_ota_agent_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/aws_ota_codesigner_certificate.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/aws_ota_codesigner_certificate.h
index 586fb2882..586fb2882 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/aws_ota_codesigner_certificate.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/aws_ota_codesigner_certificate.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/demo_config.h
index 30ee2cb28..30ee2cb28 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/iot_config.h
index 8ed948a49..8ed948a49 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/ota_no_code_signing.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/ota_no_code_signing.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/ota_no_code_signing/ota_no_code_signing.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/ota_no_code_signing/ota_no_code_signing.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/readme.txt
index 30be0bfb7..30be0bfb7 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_demo_setup.py b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_demo_setup.py
index f4925d80f..f4925d80f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_demo_setup.py
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_demo_setup.py
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c
new file mode 100755
index 000000000..85c9118ec
--- /dev/null
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c
@@ -0,0 +1,558 @@
+/*
+ * FreeRTOS Kernel V10.3.0
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * http://www.FreeRTOS.org
+ * http://aws.amazon.com/freertos
+ *
+ * 1 tab == 4 spaces!
+ */
+
+/*
+ * This file contains the code necessary to make a mutally authenticated connection,
+ * using MQTT, with credentials managed by PKCS #11.
+ */
+
+/* Standard includes. */
+#include <string.h>
+#include <stdio.h>
+
+/* Kernel includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+
+/* FreeRTOS+TCP includes. */
+#include "FreeRTOS_IP.h"
+
+/* IoT SDK includes. */
+#include "iot_mqtt.h"
+#include "platform/iot_network_freertos.h"
+
+/* Select MQTT profile */
+#include "aws_iot_demo_profile.h"
+
+/* Preprocessor check for configuration */
+#include "aws_iot_setup_check.h"
+
+
+/*
+ * Set connection profile based on the setting in demo_config.h. For more
+ * information on each variable, please refer to the respective *_profile.h
+ * file in FreeRTOS-Plus\Demo\FreeRTOS-IoT-Libraries-LTS-Beta1\include.
+ *
+ * Note that if you are running mqtt_tls_mutual_auth demo please make sure to
+ * visit the following link for setup:
+ * https://www.freertos.org/mqtt/preconfiguredexamplesMA.html
+ */
+#define mqttexampleBROKER_ENDPOINT           awsiotdemoprofileAWS_ENDPOINT
+#define mqttexampleBROKER_PORT               awsiotdemoprofileAWS_MQTT_PORT
+#define mqttexampleBROKER_CERTIFICATE_PEM    awsiotdemoprofileAWS_CERTIFICATE_PEM
+#define mqttexampleBROKER_CERTIFICATE_PEM_SIZE \
+    sizeof( awsiotdemoprofileAWS_CERTIFICATE_PEM )
+#define mqttexampleCLIENT_IDENTIFIER         awsiotdemoprofileCLIENT_IDENTIFIER
+
+/**
+ * @brief The keep-alive interval used for this example.
+ *
+ * An MQTT ping request will be sent periodically at this interval.
+ */
+#define mqttexampleKEEP_ALIVE_SECONDS        ( 60 )
+
+/**
+ * @brief The timeout for MQTT operations in this example.
+ */
+#define mqttexampleMQTT_TIMEOUT_MS           ( 5000 )
+
+/**
+ * @brief The topic to subscribe and publish to in the example.
+ *
+ * The topic starts with the client identifier to ensure that each demo interacts
+ * with a unique topic.
+ */
+#define mqttexampleTOPIC                     mqttexampleCLIENT_IDENTIFIER "/example/topic"
+
+/**
+ * @brief The MQTT message published in this example.
+ */
+#define mqttexampleMESSAGE                   "Hello World!"
+
+/**
+ * @brief Parameters to control the retry behaviour in case a QoS1 publish
+ * message gets lost.
+ *
+ * Retry every minutes up to a maximum of 5 retries.
+ */
+#define mqttexamplePUBLISH_RETRY_MS          ( 1000 )
+#define mqttexamplePUBLISH_RETRY_LIMIT       ( 5 )
+
+/**
+ * @brief The bit which is set in the demo task's notification value from the
+ * disconnect callback to inform the demo task about the MQTT disconnect.
+ */
+#define mqttexampleDISCONNECTED_BIT          ( 1UL << 0UL )
+
+/**
+ * @brief The bit which is set in the demo task's notification value from the
+ * publish callback to inform the demo task about the message received from the
+ * MQTT broker.
+ */
+#define mqttexampleMESSAGE_RECEIVED_BIT      ( 1UL << 1UL )
+
+/*-----------------------------------------------------------*/
+
+/**
+ * @brief The task used to demonstrate the MQTT API.
+ *
+ * @param[in] pvParameters Parameters as passed at the time of task creation. Not
+ * used in this example.
+ */
+static void prvMQTTDemoTask( void * pvParameters );
+
+/**
+ * @brief The callback invoked by the MQTT library when the MQTT connection gets
+ * disconnected.
+ *
+ * @param[in] pvCallbackContext Callback context as provided at the time of
+ * connect.
+ * @param[in] pxCallbackParams Contains the reason why the MQTT connection was
+ * disconnected.
+ */
+static void prvExample_OnDisconnect( void * pvCallbackContext,
+                                     IotMqttCallbackParam_t * pxCallbackParams );
+
+/**
+ * @brief The callback invoked by the MQTT library when a message is received on
+ * a subscribed topic from the MQTT broker.
+ *
+ * @param[in] pvCallbackContext Callback context as provided at the time of
+ * subscribe.
+ * @param[in] pxCallbackParams Contain the details about the received message -
+ * topic on which the message was received, the received message.
+ */
+static void prvExample_OnMessageReceived( void * pvCallbackContext,
+                                          IotMqttCallbackParam_t * pxCallbackParams );
+
+/**
+ * @brief Connects to the MQTT broker as specified in mqttexampleBROKER_ENDPOINT
+ * and mqttexampleBROKER_PORT.
+ */
+static void prvMQTTConnect( void );
+
+/**
+ * @brief Subscribes to the topic as specified in mqttexampleTOPIC.
+ */
+static void prvMQTTSubscribe( void );
+
+/**
+ * @brief Publishes a messages mqttexampleMESSAGE on mqttexampleTOPIC topic.
+ */
+static void prvMQTTPublish( void );
+
+/**
+ * @brief Unsubscribes from the mqttexampleTOPIC topic.
+ */
+static void prvMQTTUnsubscribe( void );
+
+/**
+ * @brief Disconnects from the MQTT broker gracefully by sending an MQTT
+ * DISCONNECT message.
+ */
+static void prvMQTTDisconnect( void );
+
+/**
+ * @brief Initialises the IoT libraries used by this demo.
+ */
+static void prvInitialiseLibraries( void );
+
+/**
+ * @brief The MQTT connection handle used in this example.
+ */
+static IotMqttConnection_t xMQTTConnection = NULL;
+
+/*-----------------------------------------------------------*/
+
+static const struct IotNetworkServerInfo xMQTTBrokerInfo =
+{
+    .pHostName = mqttexampleBROKER_ENDPOINT,
+    .port      = mqttexampleBROKER_PORT
+};
+
+static struct IotNetworkCredentials xNetworkSecurityCredentials =
+{
+    /* Optional TLS extensions. For this demo, they are disabled. */
+    .pAlpnProtos       = NULL,
+    .maxFragmentLength = 0,
+
+    /* SNI is enabled by default. */
+    .disableSni        = false,
+
+    /* Provide the certificate for validating the server. Only required for
+     * demos using TLS. */
+    .pRootCa           = mqttexampleBROKER_CERTIFICATE_PEM,
+    .rootCaSize        = mqttexampleBROKER_CERTIFICATE_PEM_SIZE,
+};
+
+static IotMqttNetworkInfo_t xNetworkInfo =
+{
+    /* No connection to the MQTT broker has been established yet and we want to
+     * establish a new connection. */
+    .createNetworkConnection        = true,
+    .u.setup.pNetworkServerInfo     = &( xMQTTBrokerInfo ),
+
+    /* Set the TLS credentials for the new MQTT connection. */
+    .u.setup.pNetworkCredentialInfo = &xNetworkSecurityCredentials,
+    /* Use FreeRTOS+TCP network interface. */
+    .pNetworkInterface              = IOT_NETWORK_INTERFACE_FREERTOS,
+
+    /* Setup the callback which is called when the MQTT connection is
+     * disconnected. The task handle is passed as the callback context which
+     * is used by the callback to send a task notification to this task.*/
+    .disconnectCallback.function    = prvExample_OnDisconnect
+};
+
+static const IotMqttConnectInfo_t xConnectInfo =
+{
+    /* Set this flag to true if connecting to the AWS IoT MQTT broker. */
+    .awsIotMqttMode            = true,
+
+    /* Start with a clean session i.e. direct the MQTT broker to discard any
+     * previous session data. Also, establishing a connection with clean session
+     * will ensure that the broker does not store any data when this client
+     * gets disconnected. */
+    .cleanSession              = true,
+
+    /* Since we are starting with a clean session, there are no previous
+     * subscriptions to be restored. */
+    .pPreviousSubscriptions    = NULL,
+    .previousSubscriptionCount = 0,
+
+    /* We do not want to publish Last Will and Testament (LWT) message if the
+     * client gets disconnected. */
+    .pWillInfo                 = NULL,
+
+    /* Send an MQTT PING request every minute to keep the connection open if
+     * there is no other MQTT traffic. */
+    .keepAliveSeconds          = mqttexampleKEEP_ALIVE_SECONDS,
+
+    /* The client identifier is used to uniquely identify this MQTT client to
+     * the MQTT broker.  In a production device the identifier can be something
+     * unique, such as a device serial number. */
+    .pClientIdentifier         = mqttexampleCLIENT_IDENTIFIER,
+    .clientIdentifierLength    = ( uint16_t ) sizeof( mqttexampleCLIENT_IDENTIFIER ) - 1,
+
+    /* This example does not authenticate the client and therefore username and
+     * password fields are not used. */
+    .pUserName                 = NULL,
+    .userNameLength            = 0,
+    .pPassword                 = NULL,
+    .passwordLength            = 0
+};
+/*-----------------------------------------------------------*/
+
+
+void vStartPKCSMutualAuthDemo( void )
+{
+    TickType_t xShortDelay = ( TickType_t ) pdMS_TO_TICKS( ( TickType_t ) 500 );
+
+    /* Wait a short time to allow receipt of the ARP replies. */
+    vTaskDelay( xShortDelay );
+
+    /* This example uses a single application task, which in turn is used to
+     * connect, subscribe, publish, unsubscribe and disconnect from the MQTT
+     * broker. */
+    xTaskCreate( prvMQTTDemoTask,          /* Function that implements the task. */
+                 "MQTTDemo",               /* Text name for the task - only used for debugging. */
+                 configMINIMAL_STACK_SIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
+                 NULL,                     /* Task parameter - not used in this case. */
+                 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
+                 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTDemoTask( void * pvParameters )
+{
+    uint32_t ulNotificationValue = 0, ulPublishCount;
+    const uint32_t ulMaxPublishCount = 5UL;
+    const TickType_t xNoDelay = ( TickType_t ) 0;
+
+    /* Remove compiler warnings about unused parameters. */
+    ( void ) pvParameters;
+
+    /* One time initialisation of the libraries used by this demo. */
+    prvInitialiseLibraries();
+
+    for( ; ; )
+    {
+        /* Notifications are used to send events from the callback functions to this
+         * task.  Don't expect any notifications to be pending at the beginning of the
+         * loop. */
+        configASSERT( ulTaskNotifyTake( pdTRUE, xNoDelay ) == 0 );
+
+        /****************************** Connect. ******************************/
+
+        /* Establish a connection to the MQTT broker. This example connects to
+         * the MQTT broker as specified by the compile time constants
+         * mqttexampleBROKER_ENDPOINT and mqttexampleBROKER_PORT.
+         * Please change it to the MQTT broker you want to connect to. */
+        configPRINTF( ( "Attempt to connect to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+        prvMQTTConnect();
+        configPRINTF( ( "Connected to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+
+
+        /**************************** Subscribe. ******************************/
+
+        /* The client is now connected to the broker. Subscribe to the topic
+         * as specified by the mqttexampleTOPIC compile time constant.  This
+         * client will then publish to the same topic it subscribed to, so will
+         * expect all the messages it sends to the broker to be sent back to it
+         * from the broker. */
+        configPRINTF( ( "Attempt to subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
+        prvMQTTSubscribe();
+        configPRINTF( ( "Subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
+
+
+        /*********************** Publish ulMaxPublishCount messages. **********/
+
+        /* Publish a few messages while connected. */
+        for( ulPublishCount = 0; ulPublishCount < ulMaxPublishCount; ulPublishCount++ )
+        {
+            /* Publish a message on the topic specified by the mqttexampleTOPIC
+             * compile time constant. */
+            configPRINTF( ( "Publish %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+            prvMQTTPublish();
+            configPRINTF( ( "Published %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+
+            /* Since we are subscribed to the same topic as we published on, we
+             * will get the same message back from the MQTT broker. Wait for the
+             * message to be received which is signaled to us by the publish
+             * callback (prvExample_OnMessageReceived) setting the
+             * mqttexampleMESSAGE_RECEIVED_BIT bit in this task's notification
+             * value. Note the bit is then cleared in the task's notification value
+             * to ensure the bit being set can be detected on the next iteration. */
+            xTaskNotifyWait( 0UL,                             /* Don't clear any bits on entry. */
+                             mqttexampleMESSAGE_RECEIVED_BIT, /* Clear bit on exit. */
+                             &( ulNotificationValue ),        /* Obtain the notification value. */
+                             pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+            configASSERT( ( ulNotificationValue & mqttexampleMESSAGE_RECEIVED_BIT ) == mqttexampleMESSAGE_RECEIVED_BIT );
+        }
+
+        /******************* Unsubscribe and Disconnect. **********************/
+
+        /* Unsubscribe from the topic mqttexampleTOPIC and disconnect
+         * gracefully. */
+        prvMQTTUnsubscribe();
+        prvMQTTDisconnect();
+        configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
+
+        /* Wait for the disconnect operation to complete which is signaled to us
+         * by the disconnect callback (prvExample_OnDisconnect)by setting
+         * the mqttexampleDISCONNECTED_BIT bit in this task's notification value.
+         * Note the bit is cleared in the task's notification value again to ensure
+         * it being set can be detected again on the next iteration. */
+        xTaskNotifyWait( 0UL,                         /* Don't clear any bits on entry. */
+                         mqttexampleDISCONNECTED_BIT, /* Clear bit on exit. */
+                         &( ulNotificationValue ),    /* Obtain the notification value. */
+                         pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+        configASSERT( ( ulNotificationValue & mqttexampleDISCONNECTED_BIT ) == mqttexampleDISCONNECTED_BIT );
+
+        /* Delay between iterations to avoid broker throttling. */
+        configPRINTF( ( "prvMQTTDemoTask() completed an iteration successfully. Total free heap is %u\r\n", xPortGetFreeHeapSize() ) );
+        configPRINTF( ( "Demo completed successfully.\r\n" ) );
+        configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
+
+        vTaskDelay( pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
+    }
+}
+/*-----------------------------------------------------------*/
+
+static void prvExample_OnDisconnect( void * pvCallbackContext,
+                                     IotMqttCallbackParam_t * pxCallbackParams )
+{
+    TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
+
+    /* Ensure that we initiated the disconnect. */
+    configASSERT( pxCallbackParams->u.disconnectReason == IOT_MQTT_DISCONNECT_CALLED );
+
+    /* Inform the demo task about the disconnect. */
+    xTaskNotify( xDemoTaskHandle,
+                 mqttexampleDISCONNECTED_BIT,
+                 eSetBits /* Set the mqttexampleDISCONNECTED_BIT in the demo task's notification value. */
+                 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvExample_OnMessageReceived( void * pvCallbackContext,
+                                          IotMqttCallbackParam_t * pxCallbackParams )
+{
+    TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
+
+    /* Ensure the message is received on the expected topic. */
+    configASSERT( pxCallbackParams->u.message.info.topicNameLength == strlen( mqttexampleTOPIC ) );
+    configASSERT( strncmp( pxCallbackParams->u.message.info.pTopicName,
+                           mqttexampleTOPIC,
+                           strlen( mqttexampleTOPIC ) ) == 0 );
+
+    /* Ensure the message itself is as expected. */
+    configASSERT( pxCallbackParams->u.message.info.payloadLength == strlen( mqttexampleMESSAGE ) );
+    configASSERT( strncmp( pxCallbackParams->u.message.info.pPayload,
+                           mqttexampleMESSAGE,
+                           strlen( mqttexampleMESSAGE ) ) == 0 );
+
+    /* Ensure the message Quality of Service (QoS) is as expected. */
+    configASSERT( pxCallbackParams->u.message.info.qos == IOT_MQTT_QOS_1 );
+
+    /* So as not to worry about string lengths the print message uses the
+     * consts rather than the data from the message, but the asserts above have
+     * already checked the two are equal. */
+    configPRINTF( ( "Received %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
+
+    /* Inform the demo task about the message received from the MQTT broker by
+     * setting the mqttexampleMESSAGE_RECEIVED_BIT bit in the task's notification
+     * value. */
+    xTaskNotify( xDemoTaskHandle,
+                 mqttexampleMESSAGE_RECEIVED_BIT,
+                 eSetBits /* Set the mqttexampleMESSAGE_RECEIVED_BIT in the demo task's notification value. */
+                 );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTConnect( void )
+{
+    IotMqttError_t xResult;
+
+    /* Set the context to pass into the disconnect callback function. */
+    xNetworkInfo.disconnectCallback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
+
+    /* Establish the connection to the MQTT broker - It is a blocking call and
+     * will return only when connection is complete or a timeout occurs.  The
+     * network and connection structures are declared and initialised at the top
+     * of this file. */
+    xResult = IotMqtt_Connect( &( xNetworkInfo ),
+                               &( xConnectInfo ),
+                               mqttexampleMQTT_TIMEOUT_MS,
+                               &( xMQTTConnection ) );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTDisconnect( void )
+{
+    /* Send a MQTT DISCONNECT packet to the MQTT broker to do a graceful
+     * disconnect. */
+    IotMqtt_Disconnect( xMQTTConnection,
+                        0 /* flags - 0 means a graceful disconnect by sending MQTT DISCONNECT. */
+                        );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTSubscribe( void )
+{
+    IotMqttError_t xResult;
+    IotMqttSubscription_t xMQTTSubscription;
+
+    /* Subscribe to the mqttexampleTOPIC topic filter. The task handle is passed
+     * as the callback context, which is then used by the callback to send a task
+     * notification to this task.*/
+    xMQTTSubscription.qos = IOT_MQTT_QOS_1;
+    xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
+    xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+    xMQTTSubscription.callback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
+    xMQTTSubscription.callback.function = prvExample_OnMessageReceived;
+
+    /* Use the synchronous API to subscribe - It is a blocking call and only
+     * returns when the subscribe operation is complete or a timeout occurs. */
+    xResult = IotMqtt_SubscribeSync( xMQTTConnection,
+                                     &( xMQTTSubscription ),
+                                     1, /* We are subscribing to one topic filter. */
+                                     0, /* flags - currently ignored. */
+                                     mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTPublish( void )
+{
+    IotMqttError_t xResult;
+    IotMqttPublishInfo_t xMQTTPublishInfo;
+
+    /* Publish a message with QoS1 on the mqttexampleTOPIC topic. Since we are
+     * subscribed to the same topic, the MQTT broker will send the same message
+     * back to us. It is verified in the publish callback. */
+    xMQTTPublishInfo.qos = IOT_MQTT_QOS_1;
+    xMQTTPublishInfo.retain = false;
+    xMQTTPublishInfo.pTopicName = mqttexampleTOPIC;
+    xMQTTPublishInfo.topicNameLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+    xMQTTPublishInfo.pPayload = mqttexampleMESSAGE;
+    xMQTTPublishInfo.payloadLength = strlen( mqttexampleMESSAGE );
+    xMQTTPublishInfo.retryMs = mqttexamplePUBLISH_RETRY_MS;
+    xMQTTPublishInfo.retryLimit = mqttexamplePUBLISH_RETRY_LIMIT;
+
+    /* Use the synchronous API to publish - It is a blocking call and only
+     * returns when the publish operation is complete or a timeout occurs. */
+    xResult = IotMqtt_PublishSync( xMQTTConnection,
+                                   &( xMQTTPublishInfo ),
+                                   0, /* flags - currently ignored. */
+                                   mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvMQTTUnsubscribe( void )
+{
+    IotMqttError_t xResult;
+    IotMqttSubscription_t xMQTTSubscription;
+
+    /* Unsubscribe from the mqttexampleTOPIC topic filter. */
+    xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
+    xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
+
+    /* The following members of the IotMqttSubscription_t are ignored by the
+     * unsubscribe operation. Just initialize them to avoid "use of uninitialized
+     * variable" warnings. */
+    xMQTTSubscription.qos = IOT_MQTT_QOS_1;
+    xMQTTSubscription.callback.pCallbackContext = NULL;
+    xMQTTSubscription.callback.function = NULL;
+
+    /* Use the synchronous API to unsubscribe - It is a blocking call and only
+     * returns when the unsubscribe operation is complete or a timeout occurs. */
+    xResult = IotMqtt_UnsubscribeSync( xMQTTConnection,
+                                       &( xMQTTSubscription ),
+                                       1, /* We are unsubscribing from one topic filter. */
+                                       0, /* flags - currently ignored. */
+                                       mqttexampleMQTT_TIMEOUT_MS );
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
+
+static void prvInitialiseLibraries( void )
+{
+    IotMqttError_t xResult;
+    IotNetworkError_t xNetworkResult; /*_RB_ Are three types necessary, one for each lib? */
+
+    /* Initialize the network stack abstraction for FreeRTOS. */
+    xNetworkResult = IotNetworkFreeRTOS_Init();
+    configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
+
+    /* MQTT library must be initialized before it can be used. This is just one
+     * time initialization. */
+    xResult = IotMqtt_Init();
+    configASSERT( xResult == IOT_MQTT_SUCCESS );
+}
+/*-----------------------------------------------------------*/
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSConfig.h
index 4c4246b71..4c4246b71 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
index 4f17259b4..4f17259b4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
index e8a8aa27f..e8a8aa27f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/Run-time-stats-utils.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/Run-time-stats-utils.c
index 0b2388f93..0b2388f93 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/Run-time-stats-utils.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/Run-time-stats-utils.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj
index 8079a939c..2646c73f8 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\utils\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\pkcs11\include;..\..\..\..\Source\pkcs11;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\include\;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\pkcs11\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\tls\include;..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls_utils;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\utils\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\pkcs11\include;..\..\..\..\Source\pkcs11;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\include\;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\pkcs11\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\tls\include;..\..\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls_utils;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -119,7 +119,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -147,24 +147,24 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />

     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />

     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_pkcs11_freertos.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\src\iot_pkcs11_mbedtls.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\src\iot_pkcs11_pal.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\pkcs11\src\iot_pkcs11.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\tls\src\iot_tls.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\utils\src\iot_pki_utils.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_pkcs11_freertos.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\src\iot_pkcs11_mbedtls.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\src\iot_pkcs11_pal.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\pkcs11\src\iot_pkcs11.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\tls\src\iot_tls.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\utils\src\iot_pki_utils.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />

     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />

     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />

     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />

@@ -507,23 +507,23 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />

     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />

     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\include\iot_pkcs11_pal.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\pkcs11\include\iot_pkcs11.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\tls\include\iot_tls.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\utils\include\iot_pki_utils.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\include\iot_pkcs11_pal.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\pkcs11\include\iot_pkcs11.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\tls\include\iot_tls.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\utils\include\iot_pki_utils.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />

     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />

     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />

     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj.filters
index 149c62128..08bd05e55 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WIN32.vcxproj.filters
@@ -151,31 +151,31 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_Stream_Buffer.c">

       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>

     </ClCompile>

     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">

@@ -415,34 +415,34 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">

       <Filter>FreeRTOS+\mbedtls\library</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\pkcs11\src\iot_pkcs11.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\pkcs11\src\iot_pkcs11.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\utils\src\iot_pki_utils.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\utils\src\iot_pki_utils.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\tls\src\iot_tls.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\tls\src\iot_tls.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos-plus</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_pkcs11_freertos.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_pkcs11_freertos.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\src\iot_pkcs11_pal.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\src\iot_pkcs11_pal.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClCompile>

     <ClCompile Include="demo_logging.c" />

     <ClCompile Include="DemoTasks\PKCSMutualAuthExample.c" />

     <ClCompile Include="main.c" />

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\src\iot_pkcs11_mbedtls.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\src\iot_pkcs11_mbedtls.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">

+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>

     </ClCompile>

     <ClCompile Include="..\..\..\..\Source\mbedtls_utils\mbedtls_error.c">

@@ -521,26 +521,26 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\projdefs.h">

       <Filter>FreeRTOS\Source\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>

     </ClInclude>

     <ClInclude Include="iot_config.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>

     </ClInclude>

     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\aes.h">

@@ -780,36 +780,36 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">

       <Filter>FreeRTOS+\mbedtls\include</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform\types</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\platform</Filter>

     </ClInclude>

     <ClInclude Include="..\..\include\aws_iot_demo_profile.h" />

     <ClInclude Include="iot_pkcs11_config.h" />

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\pkcs11\include\iot_pkcs11.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\pkcs11\include\iot_pkcs11.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\include\iot_pkcs11_pal.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\include\iot_pkcs11_pal.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\utils\include\iot_pki_utils.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\utils\include\iot_pki_utils.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\pkcs11</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos_plus\standard\tls\include\iot_tls.h">

+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos_plus\standard\tls\include\iot_tls.h">

       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos-plus</Filter>

     </ClInclude>

     <ClInclude Include="..\..\..\..\Source\pkcs11\pkcs11.h">

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/netif.h
index 7b3e9cd3c..7b3e9cd3c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/atomic.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/atomic.h
index 7ea61a153..7ea61a153 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/atomic.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/atomic.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.c
index b723bcd87..b723bcd87 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.h
index f1d7315a8..f1d7315a8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_config.h
index e127a408c..e127a408c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_pkcs11_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_pkcs11_config.h
index e212afa30..e212afa30 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_pkcs11_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/iot_pkcs11_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/main.c
index 67e61dcb8..67e61dcb8 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/mbedtls_config.h
index 20817cd12..20817cd12 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/pkcs11_mqtt_tls_mutual_auth_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/pkcs11_mqtt_tls_mutual_auth_demo.sln
index 87ec5ca1f..87ec5ca1f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/pkcs11_mqtt_tls_mutual_auth_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/pkcs11_mqtt_tls_mutual_auth_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/printf-stdarg.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/printf-stdarg.c
index 84b87b2a4..84b87b2a4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/printf-stdarg.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/pkcs11_mqtt_tls_mutual_auth/printf-stdarg.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/readme.txt
index 2f1d4889b..2f1d4889b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11/readme.txt
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/readme.txt
index 1caf978e2..9c6dfc90f 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/readme.txt
@@ -35,12 +35,12 @@ following links:
 The Visual Studio projects for each of the FreeRTOS IoT library examples are
 located in sub-directories of the following top-level directories:
 
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11
 
 
 *** ADDITIONAL INFORMATION ***
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/readme.txt b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/readme.txt
index 31ee9757d..31ee9757d 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/readme.txt
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/readme.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/DemoTasks/ShadowDeviceOperationsExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/DemoTasks/ShadowDeviceOperationsExamples.c
index 84a9a8cd1..84a9a8cd1 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/DemoTasks/ShadowDeviceOperationsExamples.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/DemoTasks/ShadowDeviceOperationsExamples.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/FreeRTOSConfig.h
index 2d17e44e7..2d17e44e7 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/FreeRTOSIPConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/FreeRTOSIPConfig.h
index 39a61856b..39a61856b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/FreeRTOSIPConfig.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/READ_ME_INSTRUCTIONS.url b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/READ_ME_INSTRUCTIONS.url
index 6fbe72813..6fbe72813 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/READ_ME_INSTRUCTIONS.url
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/READ_ME_INSTRUCTIONS.url
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WIN32.vcxproj
index ce0dc0246..43e1bb75d 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\include;..\..\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform;..\..\..\..\Source\mbedtls\include;.;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\include;..\..\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform;..\..\..\..\Source\mbedtls\include;.;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,7 +118,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\private;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include;..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include;..\..\..\..\Source\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -146,29 +146,29 @@
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\queue.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\tasks.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS\Source\timers.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_doc_parser.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_parser.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_parser.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_static_memory.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_doc_parser.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_parser.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_parser.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_static_memory.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c" />
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_helper.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_ARP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DHCP.c" />
     <ClCompile Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\FreeRTOS_DNS.c" />
@@ -514,29 +514,29 @@
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\include\timers.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot_doc_parser.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\include\aws_iot_shadow.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\include\types\aws_iot_shadow_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\atomic.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_atomic.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_init.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_linear_containers.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging_setup.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot_doc_parser.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\include\aws_iot_shadow.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\include\types\aws_iot_shadow_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\atomic.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_atomic.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_init.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_linear_containers.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging_setup.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt_protocol.h" />
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOSIPConfigDefaults.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_ARP.h" />
     <ClInclude Include="..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\FreeRTOS_DHCP.h" />
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WIN32.vcxproj.filters
index 38ff02b8f..8624e48a5 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WIN32.vcxproj.filters
@@ -180,31 +180,31 @@
       <Filter>FreeRTOS+\FreeRTOS+TCP</Filter>
     </ClCompile>
     <ClCompile Include="demo_logging.c" />
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_serialize.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_network.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\src\iot_mqtt_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_clock_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_clock_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_threads_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_threads_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\iot_network_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\iot_network_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\aes.c">
@@ -444,46 +444,46 @@
     <ClCompile Include="..\..\..\..\Source\mbedtls\library\xtea.c">
       <Filter>FreeRTOS+\mbedtls\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\mbedtls_platform_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\mbedtls_platform_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_api.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_api.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_parser.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_parser.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_static_memory.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_static_memory.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\src\aws_iot_shadow_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\src\aws_iot_shadow_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_operation.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_operation.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_parser.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_parser.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_subscription.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_subscription.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_validate.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_validate.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
     <ClCompile Include="DemoTasks\ShadowDeviceOperationsExamples.c">
       <Filter>DemoTasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\src\iot_logging.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\src\iot_logging.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\src\aws_iot_doc_parser.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\src\aws_iot_doc_parser.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
+    <ClCompile Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.c">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -560,13 +560,13 @@
       <Filter>FreeRTOS\Source\include</Filter>
     </ClInclude>
     <ClInclude Include="iot_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\iot_mqtt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\iot_mqtt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\mqtt\include\types\iot_mqtt_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\include\platform\iot_platform_types_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform</Filter>
     </ClInclude>
     <ClInclude Include="mbedtls_config.h" />
@@ -807,64 +807,64 @@
     <ClInclude Include="..\..\..\..\Source\mbedtls\include\mbedtls\xtea.h">
       <Filter>FreeRTOS+\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\mbedtls\threading_alt.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\mbedtls\threading_alt.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\mbedtls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\include\aws_iot_shadow.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\include\aws_iot_shadow.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\shadow\include\types\aws_iot_shadow_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\shadow\include\types\aws_iot_shadow_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\shadow\include\types</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\atomic.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\atomic.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_atomic.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_atomic.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_error.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_error.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_init.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_init.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_linear_containers.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_linear_containers.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_logging_setup.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_logging_setup.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\iot_static_memory.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\standard\common\include\iot_static_memory.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\abstractions\platform\freertos\private\taskpool\taskpool_freertos.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\aws\common\include\aws_iot_doc_parser.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\aws\common\include\aws_iot_doc_parser.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\aws\common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\aws_iot_demo_profile.h" />
     <ClInclude Include="..\..\include\aws_iot_setup_check.h" />
     <ClInclude Include="demo_config.h" />
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_clock.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_clock.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_metrics.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_metrics.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_network.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_network.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\iot_threads.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\iot_threads.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\platform\types\iot_platform_types.h">
+    <ClInclude Include="..\..\..\..\Source\FreeRTOS-IoT-Libraries-LTS-Beta1\c_sdk\platform\types\iot_platform_types.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\types</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/Packet32.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/Packet32.h
index 64be055d9..64be055d9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/Packet32.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/Packet32.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/PacketData.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/PacketData.h
index b1f166f3f..b1f166f3f 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/PacketData.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/PacketData.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/Win32-Extensions.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/Win32-Extensions.h
index bad7c33ac..bad7c33ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/Win32-Extensions.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/Win32-Extensions.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/bittypes.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/bittypes.h
index f55fcecfd..f55fcecfd 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/bittypes.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/bittypes.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/ip6_misc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/ip6_misc.h
index 562fa6184..562fa6184 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/ip6_misc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/ip6_misc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/netif.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/netif.h
index 7b3e9cd3c..7b3e9cd3c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/netif.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/netif.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-bpf.h
index 5fe129dbb..5fe129dbb 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-namedb.h
index 80a2f0040..80a2f0040 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-stdinc.h
index 417604177..417604177 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap-stdinc.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap.h
index 935f9494c..935f9494c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/bluetooth.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/bluetooth.h
index 7bf65df03..7bf65df03 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/bluetooth.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/bluetooth.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/bpf.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/bpf.h
index 9f4ca33e3..9f4ca33e3 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/bpf.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/bpf.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/namedb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/namedb.h
index 9002c7509..9002c7509 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/namedb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/namedb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/pcap.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/pcap.h
index ad8fc40ac..ad8fc40ac 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/pcap.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/pcap.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/sll.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/sll.h
index e9d5452af..e9d5452af 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/sll.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/sll.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/usb.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/usb.h
index adcd19c05..adcd19c05 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/usb.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/usb.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/vlan.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/vlan.h
index b0cb7949b..b0cb7949b 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/pcap/vlan.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/pcap/vlan.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/remote-ext.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/remote-ext.h
index 35a2fff6c..35a2fff6c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/remote-ext.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/remote-ext.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/wpcap.lib b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/wpcap.lib
index f832e0445..f832e0445 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/WinPCap/wpcap.lib
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/WinPCap/wpcap.lib
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/atomic.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/atomic.h
index d9b063bf8..d9b063bf8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/atomic.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/atomic.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_config.h
index 9d1cc5346..9d1cc5346 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_logging.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_logging.c
index 3c46ff835..3c46ff835 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_logging.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_logging.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_logging.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_logging.h
index 2cc068ce9..2cc068ce9 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/demo_logging.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/demo_logging.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/iot_config.h
index 937553be8..937553be8 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/iot_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/iot_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/main.c
index b89b1e333..b89b1e333 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/main.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/mbedtls_config.h b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/mbedtls_config.h
index 0b2d27a0c..0b2d27a0c 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/mbedtls_config.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/mbedtls_config.h
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/printf-stdarg.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/printf-stdarg.c
index 84b87b2a4..84b87b2a4 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/printf-stdarg.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/printf-stdarg.c
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/shadow_device_operations_demo.sln b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/shadow_device_operations_demo.sln
index f907d968a..f907d968a 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow/shadow_device_operations/shadow_device_operations_demo.sln
+++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow/shadow_device_operations/shadow_device_operations_demo.sln
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/DemoTasks/SimpleHTTPSExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/DemoTasks/SimpleHTTPSExamples.c
deleted file mode 100755
index 425c04a8d..000000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https/common/DemoTasks/SimpleHTTPSExamples.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
- *
- * 1 tab == 4 spaces!
- */
-
-/*
- * This file contains the common functions for plain text, basic TLS, and mutual
- * authentication HTTPS demos. Aside from the difference in security level during
- * connect, the three demos perform the same interaction with a HTTPS host. The
- * demo creates a singe application task that loops through a set of examples
- * demonstrating how to the connect to the server, send a few types of requests to
- * the server (GET, HEAD, PUT, POST), and disconnect from the server again. All
- * of the responses and their associated HTTPS response status codes are printed
- * to the console.
- *
- * The plain text HTTP demo does not authenticate the server nor the client. The
- * basic TLS HTTPS demo builds on top of the plain text demo, adding broker
- * authentication and encryption. The mutual authentication HTTPS demo builds on
- * top of the basic TLS demo, enabling both server and client authentication.
- *
- * For more information regarding the HTTPS library and the demo, please refer to:
- * https://www.freertos.org/https/index.html
- */
-
-/* Standard includes. */
-#include <string.h>
-#include <stdio.h>
-
-/* Kernel includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* FreeRTOS+TCP includes. */
-#include "FreeRTOS_IP.h"
-
-/* IoT SDK includes. */
-#include "iot_https_client.h"
-#include "platform/iot_network_freertos.h"
-
-/* HTTPS Demo Select */
-#include "demo_config.h"
-
-/* Select HTTPS profile based on the setting in demo_config.h */
-#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
-	#include "aws_iot_demo_profile.h"
-#else
-	#include "https_demo_profile.h"
-#endif
-
-/* Preprocessor check iot configuration */
-#include "aws_iot_setup_check.h"
-
-/*
- * Set the connection profile based on settings in demo_config.h. For more
- * information on each variable, please refer to the respective *_profile.h
- * file in FreeRTOS-Labs\Demo\FreeRTOS_IoT_Libraries\include.
- *
- * Note that if you are running the https_tls_mutual_auth demo please make sure
- * to visit the following link for setup:
- * https://www.freertos.org/https/preconfiguredexamplesMA.html
- */
-#if defined( AWS_IOT_DEMO_PROFILE_H )
-	#define httpsexampleHTTPS_SERVER_ADDRESS		awsiotdemoprofileAWS_ENDPOINT
-	#define httpsexampleHTTPS_SERVER_PORT			awsiotdemoprofileAWS_HTTPS_PORT
-	#define httpsexampleHTTPS_SERVER_CERTIFICATE	awsiotdemoprofileAWS_CERTIFICATE_PEM
-	#define httpsexampleCLIENT_CERTIFICATE_PEM		awsiotdemoprofileCLIENT_CERTIFICATE_PEM
-	#define httpsexampleCLIENT_PRIVATE_KEY_PEM		awsiotdemoprofileCLIENT_PRIVATE_KEY_PEM
-#elif defined( HTTPS_DEMO_PROFILE_H )
-	#define httpsexampleHTTPS_SERVER_ADDRESS		httpsdemoprofileSERVER_ADDRESS
-	#define httpsexampleHTTPS_SERVER_PORT			httpsdemoprofileSERVER_PORT
-	#define httpsexampleHTTPS_SERVER_CERTIFICATE	httpsdemoprofileSERVER_CERTIFICATE_PEM
-#endif
-
-/*
- * Each preconfigured host supports different request paths. In this demo, we
- * are using httpbin and AWS IoT.
- *
- * In the demos that uses httpbin.org see http://httpbin.org/#/HTTP_Methods for
- * details on supported REST API.
- **/
-#if defined( AWS_IOT_DEMO_PROFILE_H )
-	#define httpsexampleHTTPS_POST_PATH	   "/topics/" awsiotdemoprofileCLIENT_IDENTIFIER
-#elif defined( HTTPS_DEMO_PROFILE_H )
-	#define httpsexampleHTTPS_GET_PATH	   "/ip"
-	#define httpsexampleHTTPS_HEAD_PATH	   "/ip"
-	#define httpsexampleHTTPS_PUT_PATH	   "/put"
-	#define httpsexampleHTTPS_POST_PATH	   "/post"
-#endif
-
-/**
- * @brief The length in bytes of the user buffer to store the HTTPS Client library
- * connection context.
- *
- * The minimum size can be found in @ref connectionUserBufferMinimumSize.
- */
-#define httpsexampleCONNECTION_USER_BUFFER_LENGTH	 ( 512 )
-
-/**
- * @brief The length in bytes of the user buffer to store the HTTPS Client library
- * request context.
- *
- * The minimum size can be found in @ref requestUserBufferMinimumSize.
- */
-#define httpsexampleREQUEST_USER_BUFFER_LENGTH		 ( 512 )
-
-/**
- * @brief The length in bytes of the user buffer to store the HTTPS Client library
- * response context.
- */
-#define httpsexampleRESPONSE_USER_BUFFER_LENGTH		 ( 512 )
-
-/**
- * @brief Some text to send as the request body for a PUT and POST request in
- * this examples.
- */
-#define httpsexampleREQUEST_BODY_TEXT				 "Hello, world!"
-
-/**
- * @brief The length in bytes of the buffer used to receive the response body.
- */
-#define httpsexampleRESPONSE_BODY_BUFFER_LENGTH		 ( 512 )
-
-/**
- * @brief Timeout in ms for HTTPS operations in this example.
- */
-#define httpsexampleHTTPS_TIMEOUT_MS				 ( 5000 )
-
-/*-----------------------------------------------------------*/
-
-/**
- * @brief The HTTPS connection handle used in this example.
- */
-static IotHttpsConnectionHandle_t xHTTPSConnection = IOT_HTTPS_CONNECTION_HANDLE_INITIALIZER;
-
-/**
- * @brief A buffer used to store the HTTPS Client library's connection context.
- */
-static uint8_t ucHTTPSConnectionUserBuffer[ httpsexampleCONNECTION_USER_BUFFER_LENGTH ] = { 0 };
-
-/**
- * @brief A buffer used to store the HTTPS Client library's request context and
- * some headers.
- */
-static uint8_t ucHTTPSRequestUserBuffer[ httpsexampleREQUEST_USER_BUFFER_LENGTH ] = { 0 };
-
-/**
- * @brief A buffer used to store the HTTPS Client library's response context and
- * some headers.
- */
-static uint8_t ucHTTPSResponseUserBuffer[ httpsexampleRESPONSE_USER_BUFFER_LENGTH ] = { 0 };
-
-/**
- * @brief The request body.
- */
-static char cHTTPSRequestBodyBuffer[] = httpsexampleREQUEST_BODY_TEXT;
-
-/**
- * @brief A buffer used to receive the HTTPS Client library's response body.
- */
-static uint8_t ucHTTPSResponseBodyBuffer[ httpsexampleRESPONSE_BODY_BUFFER_LENGTH ] = { 0 };
-
-/**
- * @brief The task used to demonstrate the HTTPS Client API.
- *
- * @param[in] pvParameters Parameters as passed at the time of task creation. Not
- *            used in this example.
- */
-static void prvHTTPSDemoTask( void * pvParameters );
-
-/**
- * @brief Connects to the HTTPS server as specified in httpsexampleHTTPS_SERVER_ADDRESS
- * and httpsexampleHTTPS_SERVER_PORT.
- */
-static void prvHTTPSConnect( void );
-
-/**
- * @brief Creates and sends an HTTPS request to the HTTPS server specified in
- * httpsexampleHTTPS_SERVER_ADDRESS and httpsexampleHTTPS_SERVER_PORT.
- *
- * @param[in] xMethod The HTTPS method to use. Please #IotHttpsMethod_t for
- *            possible parameters.
- * @param[in] pcPath The path for the HTTPS request.
- * @param[in] ulPathLength The length of the input pcPath.
- */
-static void prvHTTPSRequest( IotHttpsMethod_t xMethod,
-							 const char * pcPath,
-							 uint32_t ulPathLength );
-
-/**
- * @brief Disconnects from the HTTPS server.
- */
-static void prvHTTPSDisconnect( void );
-
-/**
- * @brief Initializes the IoT libraries used by this demo.
- */
-static void prvInitialiseLibraries( void );
-
-static const IotHttpsConnectionInfo_t xConnectionInfo =
-{
-	/* No connection to the HTTPS server has been established yet and we want to
-	 * establish a new connection. */
-	.pAddress			  = httpsexampleHTTPS_SERVER_ADDRESS,
-	.addressLen			  = sizeof( httpsexampleHTTPS_SERVER_ADDRESS ) - 1,
-	.port				  = httpsexampleHTTPS_SERVER_PORT,
-	.userBuffer.pBuffer	  = ucHTTPSConnectionUserBuffer,
-	.userBuffer.bufferLen = sizeof( ucHTTPSConnectionUserBuffer ),
-
-	/* Use FreeRTOS+TCP network. */
-	.pNetworkInterface	  = IOT_NETWORK_INTERFACE_FREERTOS,
-
-	/* The HTTPS Client library uses TLS by default as indicated by the "S"
-	* postfixed to "HTTP" in the name of the library and its types and
-	* functions. There are no configurations in the flags to enable TLS. */
-	.flags				  = 0,
-
-	/* Optional TLS extensions. For this demo, they are disabled. */
-	.pAlpnProtocols		  = NULL,
-	.alpnProtocolsLen	  = 0,
-
-	/* Provide the certificate for authenticating the server. */
-	#if ( democonfigENABLE_TLS == 1 )
-		.pCaCert		  = httpsexampleHTTPS_SERVER_CERTIFICATE,
-		.caCertLen		  = sizeof( httpsexampleHTTPS_SERVER_CERTIFICATE ),
-	#else
-		.pCaCert		  = NULL,
-		.caCertLen		  = 0,
-	#endif
-
-	/* The HTTPS server at httpbin.org:443 does not require client certificates,
-	 * but AWS IoT does.
-	 * If the server were to require a client certificate, the following members
-	 * need to be set. */
-	#if ( democonfigENABLE_MUTUAL_AUTH == 1 )
-		.pClientCert	  = httpsexampleCLIENT_CERTIFICATE_PEM,
-		.clientCertLen	  = sizeof( httpsexampleCLIENT_CERTIFICATE_PEM ),
-		.pPrivateKey	  = httpsexampleCLIENT_PRIVATE_KEY_PEM,
-		.privateKeyLen	  = sizeof( httpsexampleCLIENT_PRIVATE_KEY_PEM )
-	#else
-		   .pClientCert	  = NULL,
-		.clientCertLen	  = 0,
-		.pPrivateKey	  = NULL,
-		.privateKeyLen	  = 0
-							#endif
-};
-/*-----------------------------------------------------------*/
-
-void vStartSimpleHTTPSDemo( void )
-{
-	/* This example uses a single application task, which in turn is used to
-	* connect, send a few requests, and disconnect from the HTTPS server. */
-	xTaskCreate( prvHTTPSDemoTask,         /* Function that implements the task. */
-				 "HTTPSDemo",              /* Text name for the task - only used for debugging. */
-				 democonfigDEMO_STACKSIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
-				 NULL,                     /* Task parameter - not used in this case. */
-				 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
-				 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
-}
-/*-----------------------------------------------------------*/
-
-static void prvHTTPSDemoTask( void * pvParameters )
-{
-	/* Remove compiler warnings about unused parameters. */
-	( void ) pvParameters;
-
-	/* One time initialization of the libraries used by this demo. */
-	prvInitialiseLibraries();
-
-	for( ; ; )
-	{
-		/****************************** Connect. ******************************/
-
-		/* Establish a connection to the HTTPS server. This example connects to
-		 * the HTTPS server as specified in httpsexampleHTTPS_SERVER_ADDRESS and
-		 * httpsexampleHTTPS_SERVER_PORT at the top of this file. Please change
-		 * it to the HTTPS server you want to connect to. */
-		configPRINTF( ( "Attempt to connect to %s:%d\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
-		prvHTTPSConnect();
-		configPRINTF( ( "Connected to %s:%d\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
-
-		/*********************** Send HTTPS requests. ************************/
-
-		/* The client is now connected to the server. This example will send a
-		 * GET, HEAD, PUT, and POST request. For AWS IoT profile, the example will
-		 * only send a POST request.
-		 **/
-		#if defined( httpsexampleHTTPS_GET_PATH )
-			configPRINTF( ( "Sending HTTPS GET request...\r\n" ) );
-			prvHTTPSRequest( IOT_HTTPS_METHOD_GET,
-							 httpsexampleHTTPS_GET_PATH,
-							 sizeof( httpsexampleHTTPS_GET_PATH ) - 1 );
-		#endif
-		#if defined( httpsexampleHTTPS_HEAD_PATH )
-			configPRINTF( ( "Sending HTTPS HEAD request...\r\n" ) );
-			prvHTTPSRequest( IOT_HTTPS_METHOD_HEAD,
-							 httpsexampleHTTPS_HEAD_PATH,
-							 sizeof( httpsexampleHTTPS_HEAD_PATH ) - 1 );
-		#endif
-		#if defined( httpsexampleHTTPS_PUT_PATH )
-			configPRINTF( ( "Sending HTTPS PUT request...\r\n" ) );
-			prvHTTPSRequest( IOT_HTTPS_METHOD_PUT,
-							 httpsexampleHTTPS_PUT_PATH,
-							 sizeof( httpsexampleHTTPS_PUT_PATH ) - 1 );
-		#endif
-		#if defined( httpsexampleHTTPS_POST_PATH )
-			configPRINTF( ( "Sending HTTPS POST request...\r\n" ) );
-			prvHTTPSRequest( IOT_HTTPS_METHOD_POST,
-							 httpsexampleHTTPS_POST_PATH,
-							 sizeof( httpsexampleHTTPS_POST_PATH ) - 1 );
-		#endif
-
-		/**************************** Disconnect. *****************************/
-
-		prvHTTPSDisconnect();
-		configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", httpsexampleHTTPS_SERVER_ADDRESS, httpsexampleHTTPS_SERVER_PORT ) );
-
-		/* Wait between iterations to avoid server throttling. */
-
-		configPRINTF( ( "prvHTTPSDemoTask() completed an iteration successfully. "
-						"Total free heap is %u\r\n",
-						xPortGetFreeHeapSize() ) );
-		configPRINTF( ( "Demo completed successfully.\r\n" ) );
-		configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
-		vTaskDelay( pdMS_TO_TICKS( httpsexampleHTTPS_TIMEOUT_MS ) );
-	}
-}
-
-/*-----------------------------------------------------------*/
-
-static void prvHTTPSConnect( void )
-{
-IotHttpsReturnCode_t xHTTPSClientResult;
-
-	/* Establish the connection to the HTTPS server - It is a blocking call and
-	 * will return only when the connection is complete or a timeout occurs. */
-	xHTTPSClientResult = IotHttpsClient_Connect( &( xHTTPSConnection ),
-												 &( xConnectionInfo ) );
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-}
-
-/*-----------------------------------------------------------*/
-
-static void prvHTTPSRequest( IotHttpsMethod_t xMethod,
-							 const char * pcPath,
-							 uint32_t ulPathLength )
-{
-IotHttpsReturnCode_t xHTTPSClientResult;
-IotHttpsRequestInfo_t xHTTPSRequestInfo = IOT_HTTPS_REQUEST_INFO_INITIALIZER;
-IotHttpsResponseInfo_t xHTTPSResponseInfo = IOT_HTTPS_RESPONSE_INFO_INITIALIZER;
-IotHttpsRequestHandle_t xHTTPSRequest = IOT_HTTPS_REQUEST_HANDLE_INITIALIZER;
-IotHttpsResponseHandle_t xHTTPSResponse = IOT_HTTPS_RESPONSE_HANDLE_INITIALIZER;
-IotHttpsSyncInfo_t xHTTPSSyncRequestInfo = IOT_HTTPS_SYNC_INFO_INITIALIZER;
-IotHttpsSyncInfo_t xHTTPSSyncResponseInfo = IOT_HTTPS_SYNC_INFO_INITIALIZER;
-uint16_t usResponseStatus = 0;
-
-	configASSERT( pcPath != NULL );
-
-	/************************** HTTPS request setup. ***************************/
-
-	if( ( xMethod == IOT_HTTPS_METHOD_PUT ) || ( xMethod == IOT_HTTPS_METHOD_POST ) )
-	{
-		xHTTPSSyncRequestInfo.pBody = ( uint8_t * ) cHTTPSRequestBodyBuffer;
-		xHTTPSSyncRequestInfo.bodyLen = sizeof( cHTTPSRequestBodyBuffer );
-	}
-	else
-	{
-		xHTTPSSyncRequestInfo.pBody = NULL;
-		xHTTPSSyncRequestInfo.bodyLen = 0;
-	}
-
-	xHTTPSRequestInfo.pHost = httpsexampleHTTPS_SERVER_ADDRESS;
-	xHTTPSRequestInfo.hostLen = sizeof( httpsexampleHTTPS_SERVER_ADDRESS ) - 1;
-	xHTTPSRequestInfo.pPath = pcPath;
-	xHTTPSRequestInfo.pathLen = ulPathLength;
-	xHTTPSRequestInfo.method = xMethod;
-	xHTTPSRequestInfo.isNonPersistent = false;
-	xHTTPSRequestInfo.userBuffer.pBuffer = ucHTTPSRequestUserBuffer;
-	xHTTPSRequestInfo.userBuffer.bufferLen = sizeof( ucHTTPSRequestUserBuffer ) - 1;
-	xHTTPSRequestInfo.isAsync = false;
-	xHTTPSRequestInfo.u.pSyncInfo = &xHTTPSSyncRequestInfo;
-
-	xHTTPSClientResult = IotHttpsClient_InitializeRequest( &( xHTTPSRequest ),
-														   &( xHTTPSRequestInfo ) );
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-
-	/************************** HTTPS response setup. **************************/
-
-	memset( ucHTTPSResponseBodyBuffer, 0, sizeof( ucHTTPSResponseBodyBuffer ) );
-
-	if( xMethod == IOT_HTTPS_METHOD_HEAD )
-	{
-		xHTTPSSyncResponseInfo.pBody = NULL;
-		xHTTPSSyncResponseInfo.bodyLen = 0;
-	}
-	else
-	{
-		xHTTPSSyncResponseInfo.pBody = ucHTTPSResponseBodyBuffer;
-		xHTTPSSyncResponseInfo.bodyLen = sizeof( ucHTTPSResponseBodyBuffer );
-	}
-
-	xHTTPSResponseInfo.userBuffer.pBuffer = ucHTTPSResponseUserBuffer;
-	xHTTPSResponseInfo.userBuffer.bufferLen = sizeof( ucHTTPSResponseUserBuffer );
-	xHTTPSResponseInfo.pSyncInfo = &xHTTPSSyncResponseInfo;
-
-	/*************************** Send HTTPS request. ***************************/
-
-	/* This synchronous send function blocks until the full response is received
-	 * from the network. */
-	xHTTPSClientResult = IotHttpsClient_SendSync( xHTTPSConnection,
-												  xHTTPSRequest,
-												  &( xHTTPSResponse ),
-												  &( xHTTPSResponseInfo ),
-												  httpsexampleHTTPS_TIMEOUT_MS );
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-
-	/* The response status is only available if the httpsexampleRESPONSE_USER_BUFFER
-	 * is large enough to fit not only the HTTPS Client response context, but
-	 * also the Status-Line of the response. The Status-Line and the response
-	 * headers are stored in the provided ucHTTPSResponseUserBuffer right after
-	 * the HTTPS Client response context. */
-	xHTTPSClientResult = IotHttpsClient_ReadResponseStatus( xHTTPSResponse,
-															&usResponseStatus );
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-
-	configPRINTF( ( "Response status: %d\r\n", usResponseStatus ) );
-	configPRINTF( ( "Response body: \r\n%s\r\n", ucHTTPSResponseBodyBuffer ) );
-
-	/* The response body may be too large for the print buffer. These extra
-	 * carriage returns and newlines help with clobbering. */
-	configPRINTF( ( "\r\n\r\n" ) );
-}
-
-/*-----------------------------------------------------------*/
-
-static void prvHTTPSDisconnect( void )
-{
-IotHttpsReturnCode_t xHTTPSClientResult;
-
-	/* The application must always explicitly disconnect from the server with
-	 * this API if the last request sent on the connection was a persistent
-	 * request. */
-	xHTTPSClientResult = IotHttpsClient_Disconnect( xHTTPSConnection );
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-}
-
-
-static void prvInitialiseLibraries( void )
-{
-IotHttpsReturnCode_t xHTTPSClientResult;
-IotNetworkError_t xNetworkResult;
-
-	/* Initialize the network stack abstraction for FreeRTOS. */
-	xNetworkResult = IotNetworkFreeRTOS_Init();
-	configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
-
-	/* HTTPS Client library must be initialized before it can be used. This is
-	 * just one time initialization. */
-	xHTTPSClientResult = IotHttpsClient_Init();
-	configASSERT( xHTTPSClientResult == IOT_HTTPS_OK );
-}
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/DemoTasks/SimpleMQTTExamples.c b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/DemoTasks/SimpleMQTTExamples.c
deleted file mode 100755
index 7d4ba7bd2..000000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/common/DemoTasks/SimpleMQTTExamples.c
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
- *
- * 1 tab == 4 spaces!
- */
-
-/*
- * This file contains the common functions for plain text, basic TLS, and mutual
- * authentication MQTT demos. Aside from the difference in security level during
- * connect, the three demos perform the same interaction with a MQTT broker. The
- * demos create a single application task that connects to a MQTT broker,
- * subscribes to a topic, publishes a topic with a message, and disconnect from a
- * MQTT broker. The task subscribes to the same topic it publishes to, receiving
- * the message it sends to the broker. Note that this demo does not terminate, the
- * connect-subscribe-publish-disconnect cycle is repeated for unlimited number of
- * times.
- *
- * The plain text MQTT demo does not authenticate the server nor the client. The
- * basic TLS MQTT demo builds on top of the plain text demo, adding broker
- * authentication and encryption. The mutual authentication MQTT demo builds on top
- * of the basic TLS demo, enabling both server and client authentication.
- *
- * For more information regarding the MQTT library and the demo, please refer to:
- * https://freertos.org/mqtt/index.html
- */
-
-/* Standard includes. */
-#include <string.h>
-#include <stdio.h>
-
-/* Kernel includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* FreeRTOS+TCP includes. */
-#include "FreeRTOS_IP.h"
-
-/* IoT SDK includes. */
-#include "iot_mqtt.h"
-#include "platform/iot_network_freertos.h"
-
-/* MQTT Demo Select */
-#include "demo_config.h"
-
-/* Select MQTT profile based on the setting in demo_config.h */
-#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
-	#include "aws_iot_demo_profile.h"
-#else
-	#include "mqtt_demo_profile.h"
-#endif
-
-/* Preprocessor check for configuration */
-#include "aws_iot_setup_check.h"
-
-/*
- * Set connection profile based on the setting in demo_config.h. For more
- * information on each variable, please refer to the respective *_profile.h
- * file in FreeRTOS-Labs\Demo\FreeRTOS_IoT_Libraries\include.
- *
- * Note that if you are running mqtt_tls_mutual_auth demo please make sure to
- * visit the following link for setup:
- * https://www.freertos.org/mqtt/preconfiguredexamplesMA.html
- */
-#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
-	#define mqttexampleBROKER_ENDPOINT			 awsiotdemoprofileAWS_ENDPOINT
-	#define mqttexampleBROKER_PORT				 awsiotdemoprofileAWS_MQTT_PORT
-	#define mqttexampleBROKER_CERTIFICATE_PEM	 awsiotdemoprofileAWS_CERTIFICATE_PEM
-	#define mqttexampleCLIENT_IDENTIFIER		 awsiotdemoprofileCLIENT_IDENTIFIER
-	#define mqttexampleCLIENT_CERTIFICATE_PEM	 awsiotdemoprofileCLIENT_CERTIFICATE_PEM
-	#define mqttexampleCLIENT_PRIVATE_KEY_PEM	 awsiotdemoprofileCLIENT_PRIVATE_KEY_PEM
-#else
-	#define mqttexampleBROKER_ENDPOINT			 mqttdemoprofileBROKER_ENDPOINT
-	#define mqttexampleBROKER_PORT				 mqttdemoprofileBROKER_PORT
-	#define mqttexampleBROKER_CERTIFICATE_PEM	 mqttdemoprofileBROKER_CERTIFICATE_PEM
-	#define mqttexampleCLIENT_IDENTIFIER		 mqttdemoprofileCLIENT_IDENTIFIER
-#endif /* if ( democonfigPROFILE_USE_AWS_IOT == pdTRUE ) */
-
-/**
- * @brief The keep-alive interval used for this example.
- *
- * An MQTT ping request will be sent periodically at this interval.
- *
- * @note: This value is set to zero to disable MQTT
- * keep alive for the Windows simulator project.
- * The FreeRTOS kernel does not accurately calculate time for the Windows
- * Simulator. Therefore, MQTT PING Request messages may be sent
- * at an incorrect time interval to the broker. If the broker does
- * not receive a ping request within 1.5x the time sent in a
- * connection request, the broker may close the connection.
- * To enable the keep alive feature, set this value
- * to the desired interval in seconds.
- */
-#define mqttexampleKEEP_ALIVE_SECONDS	   ( 0 )
-
-/**
- * @brief The timeout for MQTT operations in this example.
- * 
- * When passed to an MQTT API, this timeout is used only to measure the time it
- * takes for the MQTT broker to acknowledge an MQTT message. It is not used to
- * measure the total execution time of the API.
- *
- * For example, when IotMqtt_Connect API is called, MQTT CONNECT message is sent
- * to the broker. If the CONNACK message is not received from the broker in
- * mqttexampleMQTT_TIMEOUT_MS, the IotMqtt_Connect API will timeout and return
- * IOT_MQTT_TIMEOUT.
- */
-#define mqttexampleMQTT_TIMEOUT_MS		   ( 5000 )
-
-/**
- * @brief The topic to subscribe and publish to in the example.
- *
- * The topic starts with the client identifier to ensure that each demo interacts
- * with a unique topic.
- */
-#define mqttexampleTOPIC				   mqttexampleCLIENT_IDENTIFIER "/example/topic"
-
-/**
- * @brief The MQTT message published in this example.
- */
-#define mqttexampleMESSAGE				   "Hello World!"
-
-/**
- * @brief Parameters to control the retry behavior in case a QoS1 publish
- * message gets lost.
- *
- * Retry every minutes up to a maximum of 5 retries.
- */
-#define mqttexamplePUBLISH_RETRY_MS		   ( 1000 )
-#define mqttexamplePUBLISH_RETRY_LIMIT	   ( 5 )
-
-/**
- * @brief The bit which is set in the demo task's notification value from the
- * disconnect callback to inform the demo task about the MQTT disconnect.
- */
-#define mqttexampleDISCONNECTED_BIT		   ( 1UL << 0UL )
-
-/**
- * @brief The bit which is set in the demo task's notification value from the
- * publish callback to inform the demo task about the message received from the
- * MQTT broker.
- */
-#define mqttexampleMESSAGE_RECEIVED_BIT	   ( 1UL << 1UL )
-
-/*-----------------------------------------------------------*/
-
-/**
- * @brief The task used to demonstrate the MQTT API.
- *
- * @param[in] pvParameters Parameters as passed at the time of task creation. Not
- * used in this example.
- */
-static void prvMQTTDemoTask( void * pvParameters );
-
-/**
- * @brief The callback invoked by the MQTT library when the MQTT connection gets
- * disconnected.
- *
- * @param[in] pvCallbackContext Callback context as provided at the time of
- * connect.
- * @param[in] pxCallbackParams Contains the reason why the MQTT connection was
- * disconnected.
- */
-static void prvExample_OnDisconnect( void * pvCallbackContext,
-									 IotMqttCallbackParam_t * pxCallbackParams );
-
-/**
- * @brief The callback invoked by the MQTT library when a message is received on
- * a subscribed topic from the MQTT broker.
- *
- * @param[in] pvCallbackContext Callback context as provided at the time of
- * subscribe.
- * @param[in] pxCallbackParams Contain the details about the received message -
- * topic on which the message was received, the received message.
- */
-static void prvExample_OnMessageReceived( void * pvCallbackContext,
-										  IotMqttCallbackParam_t * pxCallbackParams );
-
-/**
- * @brief Connects to the MQTT broker as specified in mqttexampleBROKER_ENDPOINT
- * and mqttexampleBROKER_PORT.
- */
-static void prvMQTTConnect( void );
-
-/**
- * @brief Subscribes to the topic as specified in mqttexampleTOPIC.
- */
-static void prvMQTTSubscribe( void );
-
-/**
- * @brief Publishes a messages mqttexampleMESSAGE on mqttexampleTOPIC topic.
- */
-static void prvMQTTPublish( void );
-
-/**
- * @brief Unsubscribes from the mqttexampleTOPIC topic.
- */
-static void prvMQTTUnsubscribe( void );
-
-/**
- * @brief Disconnects from the MQTT broker gracefully by sending an MQTT
- * DISCONNECT message.
- */
-static void prvMQTTDisconnect( void );
-
-/**
- * @brief Initializes the IoT libraries used by this demo.
- */
-static void prvInitialiseLibraries( void );
-
-/**
- * @brief The MQTT connection handle used in this example.
- */
-static IotMqttConnection_t xMQTTConnection = IOT_MQTT_CONNECTION_INITIALIZER;
-
-/*-----------------------------------------------------------*/
-
-static const struct IotNetworkServerInfo xMQTTBrokerInfo =
-{
-	.pHostName = mqttexampleBROKER_ENDPOINT,
-	.port	   = mqttexampleBROKER_PORT
-};
-
-#if ( democonfigENABLE_TLS )
-	static struct IotNetworkCredentials xNetworkSecurityCredentials =
-	{
-		/* Optional TLS extensions. For this demo, they are disabled. */
-		.pAlpnProtos		= NULL,
-		.maxFragmentLength	= 0,
-
-		/* SNI is enabled by default. */
-		.disableSni			= false,
-
-		/* Provide the certificate for validating the server. Only required for
-		 * demos using TLS. */
-		.pRootCa			= mqttexampleBROKER_CERTIFICATE_PEM,
-		.rootCaSize			= sizeof( mqttexampleBROKER_CERTIFICATE_PEM ),
-
-		/* Strong mutual authentication to authenticate both the broker and
-		 * the client. */
-		#if ( democonfigENABLE_MUTUAL_AUTH )
-			.pClientCert	= mqttexampleCLIENT_CERTIFICATE_PEM,
-			.clientCertSize = sizeof( mqttexampleCLIENT_CERTIFICATE_PEM ),
-			.pPrivateKey	= mqttexampleCLIENT_PRIVATE_KEY_PEM,
-			.privateKeySize = sizeof( mqttexampleCLIENT_PRIVATE_KEY_PEM )
-		#else
-			   .pClientCert = NULL,
-			.clientCertSize = 0,
-			.pPrivateKey	= NULL,
-			.privateKeySize = 0
-							  #endif /* if ( democonfigENABLE_MUTUAL_AUTH ) */
-	};
-#endif /* if ( democonfigENABLE_TLS ) */
-
-static IotMqttNetworkInfo_t xNetworkInfo =
-{
-	/* No connection to the MQTT broker has been established yet and we want to
-	 * establish a new connection. */
-	.createNetworkConnection			= true,
-	.u.setup.pNetworkServerInfo			= &( xMQTTBrokerInfo ),
-
-	/* Set the TLS credentials for the new MQTT connection. This member is NULL
-	 * for the plain text MQTT demo. */
-	#if ( democonfigENABLE_TLS )
-		.u.setup.pNetworkCredentialInfo = &xNetworkSecurityCredentials,
-	#else
-		.u.setup.pNetworkCredentialInfo = NULL, /* Not using TLS so no credentials. */
-	#endif
-
-	/* Use FreeRTOS+TCP network interface. */
-	.pNetworkInterface					= IOT_NETWORK_INTERFACE_FREERTOS,
-
-	/* Setup the callback which is called when the MQTT connection is
-	 * disconnected. The task handle is passed as the callback context which
-	 * is used by the callback to send a task notification to this task.*/
-	.disconnectCallback.function		= prvExample_OnDisconnect
-};
-
-static const IotMqttConnectInfo_t xConnectInfo =
-{
-	/* Set this flag to true if connecting to the AWS IoT MQTT broker. */
-	#if ( democonfigPROFILE_USE_AWS_IOT == 1 )
-		.awsIotMqttMode		   = true,
-	#else
-		.awsIotMqttMode		   = false,
-	#endif
-
-	/* Start with a clean session i.e. direct the MQTT broker to discard any
-	 * previous session data. Also, establishing a connection with clean session
-	 * will ensure that the broker does not store any data when this client
-	 * gets disconnected. */
-	.cleanSession			   = true,
-
-	/* Since we are starting with a clean session, there are no previous
-	 * subscriptions to be restored. */
-	.pPreviousSubscriptions	   = NULL,
-	.previousSubscriptionCount = 0,
-
-	/* We do not want to publish Last Will and Testament (LWT) message if the
-	 * client gets disconnected. */
-	.pWillInfo				   = NULL,
-
-	/* Send an MQTT PING request every minute to keep the connection open if
-	 * there is no other MQTT traffic. */
-	.keepAliveSeconds		   = mqttexampleKEEP_ALIVE_SECONDS,
-
-	/* The client identifier is used to uniquely identify this MQTT client to
-	 * the MQTT broker.  In a production device the identifier can be something
-	 * unique, such as a device serial number. */
-	.pClientIdentifier		   = mqttexampleCLIENT_IDENTIFIER,
-	.clientIdentifierLength	   = ( uint16_t ) sizeof( mqttexampleCLIENT_IDENTIFIER ) - 1,
-
-	/* This example does not authenticate the client and therefore username and
-	 * password fields are not used. */
-	.pUserName				   = NULL,
-	.userNameLength			   = 0,
-	.pPassword				   = NULL,
-	.passwordLength			   = 0
-};
-/*-----------------------------------------------------------*/
-
-
-void vStartSimpleMQTTDemo( void )
-{
-TickType_t xShortDelay = ( TickType_t ) pdMS_TO_TICKS( ( TickType_t ) 500 );
-
-	/* Wait a short time to allow receipt of the ARP replies. */
-	vTaskDelay( xShortDelay );
-
-	/* This example uses a single application task, which in turn is used to
-	 * connect, subscribe, publish, unsubscribe and disconnect from the MQTT
-	 * broker. */
-	xTaskCreate( prvMQTTDemoTask,          /* Function that implements the task. */
-				 "MQTTDemo",               /* Text name for the task - only used for debugging. */
-				 democonfigDEMO_STACKSIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
-				 NULL,                     /* Task parameter - not used in this case. */
-				 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
-				 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTDemoTask( void * pvParameters )
-{
-uint32_t ulNotificationValue = 0, ulPublishCount;
-const uint32_t ulMaxPublishCount = 5UL;
-const TickType_t xNoDelay = ( TickType_t ) 0;
-
-	/* Remove compiler warnings about unused parameters. */
-	( void ) pvParameters;
-
-	/* One time initialization of the libraries used by this demo. */
-	prvInitialiseLibraries();
-
-	for( ; ; )
-	{
-		/* Notifications are used to send events from the callback functions to this
-		 * task.  Don't expect any notifications to be pending at the beginning of the
-		 * loop. */
-		configASSERT( ulTaskNotifyTake( pdTRUE, xNoDelay ) == 0 );
-
-
-		/****************************** Connect. ******************************/
-
-		/* Establish a connection to the MQTT broker. This example connects to
-		 * the MQTT broker as specified by the compile time constants
-		 * mqttexampleBROKER_ENDPOINT and mqttexampleBROKER_PORT.
-		 * Please change it to the MQTT broker you want to connect to. */
-		configPRINTF( ( "Attempt to connect to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-		prvMQTTConnect();
-		configPRINTF( ( "Connected to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-
-
-		/**************************** Subscribe. ******************************/
-
-		/* The client is now connected to the broker. Subscribe to the topic
-		 * as specified by the mqttexampleTOPIC compile time constant.  This
-		 * client will then publish to the same topic it subscribed to, so will
-		 * expect all the messages it sends to the broker to be sent back to it
-		 * from the broker. */
-		configPRINTF( ( "Attempt to subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
-		prvMQTTSubscribe();
-		configPRINTF( ( "Subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
-
-
-		/*********************** Publish ulMaxPublishCount messages. **********/
-
-		/* Publish a few messages while connected. */
-		for( ulPublishCount = 0; ulPublishCount < ulMaxPublishCount; ulPublishCount++ )
-		{
-			/* Publish a message on the topic specified by the mqttexampleTOPIC
-			 * compile time constant. */
-			configPRINTF( ( "Publish %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-			prvMQTTPublish();
-			configPRINTF( ( "Published %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-
-			/* Since we are subscribed to the same topic as we published on, we
-			 * will get the same message back from the MQTT broker. Wait for the
-			 * message to be received which is signaled to us by the publish
-			 * callback (prvExample_OnMessageReceived) setting the
-			 * mqttexampleMESSAGE_RECEIVED_BIT bit in this task's notification
-			 * value. Note the bit is then cleared in the task's notification value
-			 * to ensure the bit being set can be detected on the next iteration. */
-			xTaskNotifyWait( 0UL,                             /* Don't clear any bits on entry. */
-							 mqttexampleMESSAGE_RECEIVED_BIT, /* Clear bit on exit. */
-							 &( ulNotificationValue ),        /* Obtain the notification value. */
-							 pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-			configASSERT( ( ulNotificationValue & mqttexampleMESSAGE_RECEIVED_BIT ) == mqttexampleMESSAGE_RECEIVED_BIT );
-		}
-
-		/******************* Unsubscribe and Disconnect. **********************/
-
-		/* Unsubscribe from the topic mqttexampleTOPIC and disconnect
-		 * gracefully. */
-		prvMQTTUnsubscribe();
-		prvMQTTDisconnect();
-		configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-
-		/* Wait for the disconnect operation to complete which is signaled to us
-		 * by the disconnect callback (prvExample_OnDisconnect)by setting
-		 * the mqttexampleDISCONNECTED_BIT bit in this task's notification value.
-		 * Note the bit is cleared in the task's notification value again to ensure
-		 * it being set can be detected again on the next iteration. */
-		xTaskNotifyWait( 0UL,                         /* Don't clear any bits on entry. */
-						 mqttexampleDISCONNECTED_BIT, /* Clear bit on exit. */
-						 &( ulNotificationValue ),    /* Obtain the notification value. */
-						 pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-		configASSERT( ( ulNotificationValue & mqttexampleDISCONNECTED_BIT ) == mqttexampleDISCONNECTED_BIT );
-
-		/* Delay between iterations to avoid broker throttling. */
-		configPRINTF( ( "prvMQTTDemoTask() completed an iteration successfully. Total free heap is %u\r\n", xPortGetFreeHeapSize() ) );
-		configPRINTF( ( "Demo completed successfully.\r\n" ) );
-		configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
-		vTaskDelay( pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-	}
-}
-/*-----------------------------------------------------------*/
-
-static void prvExample_OnDisconnect( void * pvCallbackContext,
-									 IotMqttCallbackParam_t * pxCallbackParams )
-{
-TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
-
-	/* Ensure that we initiated the disconnect. */
-	configASSERT( pxCallbackParams->u.disconnectReason == IOT_MQTT_DISCONNECT_CALLED );
-
-	/* Inform the demo task about the disconnect. */
-	xTaskNotify( xDemoTaskHandle,
-				 mqttexampleDISCONNECTED_BIT,
-				 eSetBits /* Set the mqttexampleDISCONNECTED_BIT in the demo task's notification value. */
-				 );
-}
-/*-----------------------------------------------------------*/
-
-static void prvExample_OnMessageReceived( void * pvCallbackContext,
-										  IotMqttCallbackParam_t * pxCallbackParams )
-{
-TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
-
-	/* Ensure the message is received on the expected topic. */
-	configASSERT( pxCallbackParams->u.message.info.topicNameLength == strlen( mqttexampleTOPIC ) );
-	configASSERT( strncmp( pxCallbackParams->u.message.info.pTopicName,
-						   mqttexampleTOPIC,
-						   strlen( mqttexampleTOPIC ) ) == 0 );
-
-	/* Ensure the message itself is as expected. */
-	configASSERT( pxCallbackParams->u.message.info.payloadLength == strlen( mqttexampleMESSAGE ) );
-	configASSERT( strncmp( pxCallbackParams->u.message.info.pPayload,
-						   mqttexampleMESSAGE,
-						   strlen( mqttexampleMESSAGE ) ) == 0 );
-
-	/* Ensure the message Quality of Service (QoS) is as expected. */
-	configASSERT( pxCallbackParams->u.message.info.qos == IOT_MQTT_QOS_1 );
-
-	/* So as not to worry about string lengths the print message uses the
-	 * consts rather than the data from the message, but the asserts above have
-	 * already checked the two are equal. */
-	configPRINTF( ( "Received %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-
-	/* Inform the demo task about the message received from the MQTT broker by
-	 * setting the mqttexampleMESSAGE_RECEIVED_BIT bit in the task's notification
-	 * value. */
-	xTaskNotify( xDemoTaskHandle,
-				 mqttexampleMESSAGE_RECEIVED_BIT,
-				 eSetBits /* Set the mqttexampleMESSAGE_RECEIVED_BIT in the demo task's notification value. */
-				 );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTConnect( void )
-{
-IotMqttError_t xResult;
-
-	/* Set the context to pass into the disconnect callback function. */
-	xNetworkInfo.disconnectCallback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
-
-	/* Establish the connection to the MQTT broker - It is a blocking call and
-	 * will return only when connection is complete or a timeout occurs.  The
-	 * network and connection structures are declared and initialized at the top
-	 * of this file. */
-	xResult = IotMqtt_Connect( &( xNetworkInfo ),
-							   &( xConnectInfo ),
-							   mqttexampleMQTT_TIMEOUT_MS,
-							   &( xMQTTConnection ) );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTDisconnect( void )
-{
-	/* Send a MQTT DISCONNECT packet to the MQTT broker to do a graceful
-	 * disconnect. */
-	IotMqtt_Disconnect( xMQTTConnection,
-						0 /* flags - 0 means a graceful disconnect by sending MQTT DISCONNECT. */
-						);
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTSubscribe( void )
-{
-IotMqttError_t xResult;
-IotMqttSubscription_t xMQTTSubscription;
-
-	/* Subscribe to the mqttexampleTOPIC topic filter. The task handle is passed
-	 * as the callback context, which is then used by the callback to send a task
-	 * notification to this task.*/
-	xMQTTSubscription.qos = IOT_MQTT_QOS_1;
-	xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
-	xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-	xMQTTSubscription.callback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
-	xMQTTSubscription.callback.function = prvExample_OnMessageReceived;
-
-	/* Use the synchronous API to subscribe - It is a blocking call and only
-	 * returns when the subscribe operation is complete or a timeout occurs. */
-	xResult = IotMqtt_SubscribeSync( xMQTTConnection,
-									 &( xMQTTSubscription ),
-									 1, /* We are subscribing to one topic filter. */
-									 0, /* flags - currently ignored. */
-									 mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTPublish( void )
-{
-IotMqttError_t xResult;
-IotMqttPublishInfo_t xMQTTPublishInfo;
-
-	/* Publish a message with QoS1 on the mqttexampleTOPIC topic. Since we are
-	 * subscribed to the same topic, the MQTT broker will send the same message
-	 * back to us. It is verified in the publish callback. */
-	xMQTTPublishInfo.qos = IOT_MQTT_QOS_1;
-	xMQTTPublishInfo.retain = false;
-	xMQTTPublishInfo.pTopicName = mqttexampleTOPIC;
-	xMQTTPublishInfo.topicNameLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-	xMQTTPublishInfo.pPayload = mqttexampleMESSAGE;
-	xMQTTPublishInfo.payloadLength = strlen( mqttexampleMESSAGE );
-	xMQTTPublishInfo.retryMs = mqttexamplePUBLISH_RETRY_MS;
-	xMQTTPublishInfo.retryLimit = mqttexamplePUBLISH_RETRY_LIMIT;
-
-	/* Use the synchronous API to publish - It is a blocking call and only
-	 * returns when the publish operation is complete or a timeout occurs. */
-	xResult = IotMqtt_PublishSync( xMQTTConnection,
-								   &( xMQTTPublishInfo ),
-								   0, /* flags - currently ignored. */
-								   mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTUnsubscribe( void )
-{
-IotMqttError_t xResult;
-IotMqttSubscription_t xMQTTSubscription;
-
-	/* Unsubscribe from the mqttexampleTOPIC topic filter. */
-	xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
-	xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-
-	/* The following members of the IotMqttSubscription_t are ignored by the
-	 * unsubscribe operation. Just initialize them to avoid "use of uninitialized
-	 * variable" warnings. */
-	xMQTTSubscription.qos = IOT_MQTT_QOS_1;
-	xMQTTSubscription.callback.pCallbackContext = NULL;
-	xMQTTSubscription.callback.function = NULL;
-
-	/* Use the synchronous API to unsubscribe - It is a blocking call and only
-	 * returns when the unsubscribe operation is complete or a timeout occurs. */
-	xResult = IotMqtt_UnsubscribeSync( xMQTTConnection,
-									   &( xMQTTSubscription ),
-									   1, /* We are unsubscribing from one topic filter. */
-									   0, /* flags - currently ignored. */
-									   mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvInitialiseLibraries( void )
-{
-IotMqttError_t xResult;
-IotNetworkError_t xNetworkResult;
-
-	/* Initialize the network stack abstraction for FreeRTOS. */
-	xNetworkResult = IotNetworkFreeRTOS_Init();
-	configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
-
-	/* MQTT library must be initialized before it can be used. This is just one
-	 * time initialization. */
-	xResult = IotMqtt_Init();
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c
deleted file mode 100755
index e70b34577..000000000
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11/pkcs11_mqtt_tls_mutual_auth/DemoTasks/PKCSMutualAuthExample.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
- *
- * 1 tab == 4 spaces!
- */
-
-/*
- * This file contains the code necessary to make a mutally authenticated connection, 
- * using MQTT, with credentials managed by PKCS #11.
- */
-
-/* Standard includes. */
-#include <string.h>
-#include <stdio.h>
-
-/* Kernel includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* FreeRTOS+TCP includes. */
-#include "FreeRTOS_IP.h"
-
-/* IoT SDK includes. */
-#include "iot_mqtt.h"
-#include "platform/iot_network_freertos.h"
-
-/* Select MQTT profile */
-#include "aws_iot_demo_profile.h"
-
-/* Preprocessor check for configuration */
-#include "aws_iot_setup_check.h"
-
-
-/*
- * Set connection profile based on the setting in demo_config.h. For more
- * information on each variable, please refer to the respective *_profile.h
- * file in FreeRTOS-Plus\Demo\FreeRTOS_IoT_Libraries\include.
- *
- * Note that if you are running mqtt_tls_mutual_auth demo please make sure to
- * visit the following link for setup:
- * https://www.freertos.org/mqtt/preconfiguredexamplesMA.html
- */
-#define mqttexampleBROKER_ENDPOINT			 awsiotdemoprofileAWS_ENDPOINT
-#define mqttexampleBROKER_PORT				 awsiotdemoprofileAWS_MQTT_PORT
-#define mqttexampleBROKER_CERTIFICATE_PEM	 awsiotdemoprofileAWS_CERTIFICATE_PEM
-#define mqttexampleBROKER_CERTIFICATE_PEM_SIZE                                 \
-    sizeof(awsiotdemoprofileAWS_CERTIFICATE_PEM)
-#define mqttexampleCLIENT_IDENTIFIER		 awsiotdemoprofileCLIENT_IDENTIFIER
-
-/**
- * @brief The keep-alive interval used for this example.
- *
- * An MQTT ping request will be sent periodically at this interval.
- */
-#define mqttexampleKEEP_ALIVE_SECONDS	   ( 60 )
-
-/**
- * @brief The timeout for MQTT operations in this example.
- */
-#define mqttexampleMQTT_TIMEOUT_MS		   ( 5000 )
-
-/**
- * @brief The topic to subscribe and publish to in the example.
- *
- * The topic starts with the client identifier to ensure that each demo interacts
- * with a unique topic.
- */
-#define mqttexampleTOPIC				   mqttexampleCLIENT_IDENTIFIER "/example/topic"
-
-/**
- * @brief The MQTT message published in this example.
- */
-#define mqttexampleMESSAGE				   "Hello World!"
-
-/**
- * @brief Parameters to control the retry behaviour in case a QoS1 publish
- * message gets lost.
- *
- * Retry every minutes up to a maximum of 5 retries.
- */
-#define mqttexamplePUBLISH_RETRY_MS		   ( 1000 )
-#define mqttexamplePUBLISH_RETRY_LIMIT	   ( 5 )
-
-/**
- * @brief The bit which is set in the demo task's notification value from the
- * disconnect callback to inform the demo task about the MQTT disconnect.
- */
-#define mqttexampleDISCONNECTED_BIT		   ( 1UL << 0UL )
-
-/**
- * @brief The bit which is set in the demo task's notification value from the
- * publish callback to inform the demo task about the message received from the
- * MQTT broker.
- */
-#define mqttexampleMESSAGE_RECEIVED_BIT	   ( 1UL << 1UL )
-
-/*-----------------------------------------------------------*/
-
-/**
- * @brief The task used to demonstrate the MQTT API.
- *
- * @param[in] pvParameters Parameters as passed at the time of task creation. Not
- * used in this example.
- */
-static void prvMQTTDemoTask( void * pvParameters );
-
-/**
- * @brief The callback invoked by the MQTT library when the MQTT connection gets
- * disconnected.
- *
- * @param[in] pvCallbackContext Callback context as provided at the time of
- * connect.
- * @param[in] pxCallbackParams Contains the reason why the MQTT connection was
- * disconnected.
- */
-static void prvExample_OnDisconnect( void * pvCallbackContext,
-									 IotMqttCallbackParam_t * pxCallbackParams );
-
-/**
- * @brief The callback invoked by the MQTT library when a message is received on
- * a subscribed topic from the MQTT broker.
- *
- * @param[in] pvCallbackContext Callback context as provided at the time of
- * subscribe.
- * @param[in] pxCallbackParams Contain the details about the received message -
- * topic on which the message was received, the received message.
- */
-static void prvExample_OnMessageReceived( void * pvCallbackContext,
-										  IotMqttCallbackParam_t * pxCallbackParams );
-
-/**
- * @brief Connects to the MQTT broker as specified in mqttexampleBROKER_ENDPOINT
- * and mqttexampleBROKER_PORT.
- */
-static void prvMQTTConnect( void );
-
-/**
- * @brief Subscribes to the topic as specified in mqttexampleTOPIC.
- */
-static void prvMQTTSubscribe( void );
-
-/**
- * @brief Publishes a messages mqttexampleMESSAGE on mqttexampleTOPIC topic.
- */
-static void prvMQTTPublish( void );
-
-/**
- * @brief Unsubscribes from the mqttexampleTOPIC topic.
- */
-static void prvMQTTUnsubscribe( void );
-
-/**
- * @brief Disconnects from the MQTT broker gracefully by sending an MQTT
- * DISCONNECT message.
- */
-static void prvMQTTDisconnect( void );
-
-/**
-* @brief Initialises the IoT libraries used by this demo.
-*/
-static void prvInitialiseLibraries( void );
-
-/**
- * @brief The MQTT connection handle used in this example.
- */
-static IotMqttConnection_t xMQTTConnection = NULL;
-
-/*-----------------------------------------------------------*/
-
-static const struct IotNetworkServerInfo xMQTTBrokerInfo =
-{
-	.pHostName = mqttexampleBROKER_ENDPOINT,
-	.port = mqttexampleBROKER_PORT
-};
-
-static struct IotNetworkCredentials xNetworkSecurityCredentials =
-{
-	/* Optional TLS extensions. For this demo, they are disabled. */
-	.pAlpnProtos = NULL,
-	.maxFragmentLength = 0,
-
-	/* SNI is enabled by default. */
-	.disableSni = false,
-
-	/* Provide the certificate for validating the server. Only required for
-	demos using TLS. */
-	.pRootCa = mqttexampleBROKER_CERTIFICATE_PEM,
-    .rootCaSize = mqttexampleBROKER_CERTIFICATE_PEM_SIZE,
-};
-
-static IotMqttNetworkInfo_t xNetworkInfo =
-{
-	/* No connection to the MQTT broker has been established yet and we want to
-	 * establish a new connection. */
-	.createNetworkConnection = true,
-	.u.setup.pNetworkServerInfo = &( xMQTTBrokerInfo ),
-
-	/* Set the TLS credentials for the new MQTT connection. */
-	.u.setup.pNetworkCredentialInfo = &xNetworkSecurityCredentials,
-	/* Use FreeRTOS+TCP network interface. */
-	.pNetworkInterface = IOT_NETWORK_INTERFACE_FREERTOS,
-
-	/* Setup the callback which is called when the MQTT connection is
-	 * disconnected. The task handle is passed as the callback context which
-	 * is used by the callback to send a task notification to this task.*/
-	.disconnectCallback.function = prvExample_OnDisconnect
-};
-
-static const IotMqttConnectInfo_t xConnectInfo =
-{
-	/* Set this flag to true if connecting to the AWS IoT MQTT broker. */
-	.awsIotMqttMode = true,
-	/* Start with a clean session i.e. direct the MQTT broker to discard any
-	 * previous session data. Also, establishing a connection with clean session
-	 * will ensure that the broker does not store any data when this client
-	 * gets disconnected. */
-	.cleanSession = true,
-
-	/* Since we are starting with a clean session, there are no previous
-	 * subscriptions to be restored. */
-	.pPreviousSubscriptions = NULL,
-	.previousSubscriptionCount = 0,
-
-	/* We do not want to publish Last Will and Testament (LWT) message if the
-	 * client gets disconnected. */
-	.pWillInfo = NULL,
-
-	/* Send an MQTT PING request every minute to keep the connection open if
-	there is no other MQTT traffic. */
-	.keepAliveSeconds = mqttexampleKEEP_ALIVE_SECONDS,
-
-	/* The client identifier is used to uniquely identify this MQTT client to
-	 * the MQTT broker.  In a production device the identifier can be something
-	 * unique, such as a device serial number. */
-	.pClientIdentifier = mqttexampleCLIENT_IDENTIFIER,
-	.clientIdentifierLength = ( uint16_t ) sizeof( mqttexampleCLIENT_IDENTIFIER ) - 1,
-
-	/* This example does not authenticate the client and therefore username and
-	 * password fields are not used. */
-	.pUserName = NULL,
-	.userNameLength = 0,
-	.pPassword = NULL,
-	.passwordLength = 0
-};
-/*-----------------------------------------------------------*/
-
-
-void vStartPKCSMutualAuthDemo( void )
-{
-TickType_t xShortDelay = ( TickType_t ) pdMS_TO_TICKS( ( TickType_t ) 500 );
-
-	/* Wait a short time to allow receipt of the ARP replies. */
-	vTaskDelay( xShortDelay );
-
-	/* This example uses a single application task, which in turn is used to
-	 * connect, subscribe, publish, unsubscribe and disconnect from the MQTT
-	 * broker. */
-	xTaskCreate( prvMQTTDemoTask,          /* Function that implements the task. */
-				 "MQTTDemo",               /* Text name for the task - only used for debugging. */
-				 configMINIMAL_STACK_SIZE, /* Size of stack (in words, not bytes) to allocate for the task. */
-				 NULL,                     /* Task parameter - not used in this case. */
-				 tskIDLE_PRIORITY,         /* Task priority, must be between 0 and configMAX_PRIORITIES - 1. */
-				 NULL );                   /* Used to pass out a handle to the created task - not used in this case. */
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTDemoTask( void * pvParameters )
-{
-uint32_t ulNotificationValue = 0, ulPublishCount;
-const uint32_t ulMaxPublishCount = 5UL;
-const TickType_t xNoDelay = ( TickType_t ) 0;
-
-	/* Remove compiler warnings about unused parameters. */
-	( void ) pvParameters;
-
-	/* One time initialisation of the libraries used by this demo. */
-	prvInitialiseLibraries();
-
-	for( ; ; )
-	{
-		/* Notifications are used to send events from the callback functions to this
-		 * task.  Don't expect any notifications to be pending at the beginning of the
-		 * loop. */
-		configASSERT( ulTaskNotifyTake( pdTRUE, xNoDelay ) == 0 );
-
-		/****************************** Connect. ******************************/
-
-		/* Establish a connection to the MQTT broker. This example connects to
-		 * the MQTT broker as specified by the compile time constants
-		 * mqttexampleBROKER_ENDPOINT and mqttexampleBROKER_PORT.
-		 * Please change it to the MQTT broker you want to connect to. */
-		configPRINTF( ( "Attempt to connect to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-		prvMQTTConnect();
-		configPRINTF( ( "Connected to %s:%d\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-
-
-		/**************************** Subscribe. ******************************/
-
-		/* The client is now connected to the broker. Subscribe to the topic
-		 * as specified by the mqttexampleTOPIC compile time constant.  This
-		 * client will then publish to the same topic it subscribed to, so will
-		 * expect all the messages it sends to the broker to be sent back to it
-		 * from the broker. */
-		configPRINTF( ( "Attempt to subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
-		prvMQTTSubscribe();
-		configPRINTF( ( "Subscribed to the topic %s\r\n", mqttexampleTOPIC ) );
-
-
-		/*********************** Publish ulMaxPublishCount messages. **********/
-
-		/* Publish a few messages while connected. */
-		for( ulPublishCount = 0; ulPublishCount < ulMaxPublishCount; ulPublishCount++ )
-		{
-			/* Publish a message on the topic specified by the mqttexampleTOPIC
-			 * compile time constant. */
-			configPRINTF( ( "Publish %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-			prvMQTTPublish();
-			configPRINTF( ( "Published %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-
-			/* Since we are subscribed to the same topic as we published on, we
-			 * will get the same message back from the MQTT broker. Wait for the
-			 * message to be received which is signaled to us by the publish
-			 * callback (prvExample_OnMessageReceived) setting the
-			 * mqttexampleMESSAGE_RECEIVED_BIT bit in this task's notification
-			 * value. Note the bit is then cleared in the task's notification value
-			 * to ensure the bit being set can be detected on the next iteration. */
-			xTaskNotifyWait( 0UL,                             /* Don't clear any bits on entry. */
-							 mqttexampleMESSAGE_RECEIVED_BIT, /* Clear bit on exit. */
-							 &( ulNotificationValue ),        /* Obtain the notification value. */
-							 pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-			configASSERT( ( ulNotificationValue & mqttexampleMESSAGE_RECEIVED_BIT ) == mqttexampleMESSAGE_RECEIVED_BIT );
-		}
-
-		/******************* Unsubscribe and Disconnect. **********************/
-
-		/* Unsubscribe from the topic mqttexampleTOPIC and disconnect
-		 * gracefully. */
-		prvMQTTUnsubscribe();
-		prvMQTTDisconnect();
-		configPRINTF( ( "Disconnected from %s:%d\r\n\r\n", mqttexampleBROKER_ENDPOINT, mqttexampleBROKER_PORT ) );
-
-		/* Wait for the disconnect operation to complete which is signaled to us
-		 * by the disconnect callback (prvExample_OnDisconnect)by setting
-		 * the mqttexampleDISCONNECTED_BIT bit in this task's notification value.
-		 * Note the bit is cleared in the task's notification value again to ensure
-		 * it being set can be detected again on the next iteration. */
-		xTaskNotifyWait( 0UL,                         /* Don't clear any bits on entry. */
-						 mqttexampleDISCONNECTED_BIT, /* Clear bit on exit. */
-						 &( ulNotificationValue ),    /* Obtain the notification value. */
-						 pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-		configASSERT( ( ulNotificationValue & mqttexampleDISCONNECTED_BIT ) == mqttexampleDISCONNECTED_BIT );
-
-		/* Delay between iterations to avoid broker throttling. */
-		configPRINTF( ( "prvMQTTDemoTask() completed an iteration successfully. Total free heap is %u\r\n", xPortGetFreeHeapSize() ) );
-		configPRINTF( ( "Demo completed successfully.\r\n" ) );
-		configPRINTF( ( "Short delay before starting the next iteration.... \r\n\r\n" ) );
-
-		vTaskDelay( pdMS_TO_TICKS( mqttexampleMQTT_TIMEOUT_MS ) );
-	}
-}
-/*-----------------------------------------------------------*/
-
-static void prvExample_OnDisconnect( void * pvCallbackContext,
-									 IotMqttCallbackParam_t * pxCallbackParams )
-{
-TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
-
-	/* Ensure that we initiated the disconnect. */
-	configASSERT( pxCallbackParams->u.disconnectReason == IOT_MQTT_DISCONNECT_CALLED );
-
-	/* Inform the demo task about the disconnect. */
-	xTaskNotify( xDemoTaskHandle,
-				 mqttexampleDISCONNECTED_BIT,
-				 eSetBits /* Set the mqttexampleDISCONNECTED_BIT in the demo task's notification value. */
-				 );
-}
-/*-----------------------------------------------------------*/
-
-static void prvExample_OnMessageReceived( void * pvCallbackContext,
-										  IotMqttCallbackParam_t * pxCallbackParams )
-{
-TaskHandle_t xDemoTaskHandle = ( TaskHandle_t ) pvCallbackContext;
-
-	/* Ensure the message is received on the expected topic. */
-	configASSERT( pxCallbackParams->u.message.info.topicNameLength == strlen( mqttexampleTOPIC ) );
-	configASSERT( strncmp( pxCallbackParams->u.message.info.pTopicName,
-						   mqttexampleTOPIC,
-						   strlen( mqttexampleTOPIC ) ) == 0 );
-
-	/* Ensure the message itself is as expected. */
-	configASSERT( pxCallbackParams->u.message.info.payloadLength == strlen( mqttexampleMESSAGE ) );
-	configASSERT( strncmp( pxCallbackParams->u.message.info.pPayload,
-						   mqttexampleMESSAGE,
-						   strlen( mqttexampleMESSAGE ) ) == 0 );
-
-	/* Ensure the message Quality of Service (QoS) is as expected. */
-	configASSERT( pxCallbackParams->u.message.info.qos == IOT_MQTT_QOS_1 );
-
-	/* So as not to worry about string lengths the print message uses the
-	 * consts rather than the data from the message, but the asserts above have
-	 * already checked the two are equal. */
-	configPRINTF( ( "Received %s on the topic %s\r\n", mqttexampleMESSAGE, mqttexampleTOPIC ) );
-
-	/* Inform the demo task about the message received from the MQTT broker by
-	 * setting the mqttexampleMESSAGE_RECEIVED_BIT bit in the task's notification
-	 * value. */
-	xTaskNotify( xDemoTaskHandle,
-				 mqttexampleMESSAGE_RECEIVED_BIT,
-				 eSetBits /* Set the mqttexampleMESSAGE_RECEIVED_BIT in the demo task's notification value. */
-				 );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTConnect( void )
-{
-IotMqttError_t xResult;
-
-	/* Set the context to pass into the disconnect callback function. */
-	xNetworkInfo.disconnectCallback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
-
-	/* Establish the connection to the MQTT broker - It is a blocking call and
-	will return only when connection is complete or a timeout occurs.  The
-	network and connection structures are declared and initialised at the top
-	of this file. */
-	xResult = IotMqtt_Connect( &( xNetworkInfo ),
-							   &( xConnectInfo ),
-							   mqttexampleMQTT_TIMEOUT_MS,
-							   &( xMQTTConnection ) );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTDisconnect( void )
-{
-	/* Send a MQTT DISCONNECT packet to the MQTT broker to do a graceful
-	 * disconnect. */
-	IotMqtt_Disconnect( xMQTTConnection,
-						0 /* flags - 0 means a graceful disconnect by sending MQTT DISCONNECT. */
-						);
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTSubscribe( void )
-{
-IotMqttError_t xResult;
-IotMqttSubscription_t xMQTTSubscription;
-
-	/* Subscribe to the mqttexampleTOPIC topic filter. The task handle is passed
-	 * as the callback context, which is then used by the callback to send a task
-	 * notification to this task.*/
-	xMQTTSubscription.qos = IOT_MQTT_QOS_1;
-	xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
-	xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-	xMQTTSubscription.callback.pCallbackContext = ( void * ) xTaskGetCurrentTaskHandle();
-	xMQTTSubscription.callback.function = prvExample_OnMessageReceived;
-
-	/* Use the synchronous API to subscribe - It is a blocking call and only
-	 * returns when the subscribe operation is complete or a timeout occurs. */
-	xResult = IotMqtt_SubscribeSync( xMQTTConnection,
-									 &( xMQTTSubscription ),
-									 1, /* We are subscribing to one topic filter. */
-									 0, /* flags - currently ignored. */
-									 mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTPublish( void )
-{
-IotMqttError_t xResult;
-IotMqttPublishInfo_t xMQTTPublishInfo;
-
-	/* Publish a message with QoS1 on the mqttexampleTOPIC topic. Since we are
-	 * subscribed to the same topic, the MQTT broker will send the same message
-	 * back to us. It is verified in the publish callback. */
-	xMQTTPublishInfo.qos = IOT_MQTT_QOS_1;
-	xMQTTPublishInfo.retain = false;
-	xMQTTPublishInfo.pTopicName = mqttexampleTOPIC;
-	xMQTTPublishInfo.topicNameLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-	xMQTTPublishInfo.pPayload = mqttexampleMESSAGE;
-	xMQTTPublishInfo.payloadLength = strlen( mqttexampleMESSAGE );
-	xMQTTPublishInfo.retryMs = mqttexamplePUBLISH_RETRY_MS;
-	xMQTTPublishInfo.retryLimit = mqttexamplePUBLISH_RETRY_LIMIT;
-
-	/* Use the synchronous API to publish - It is a blocking call and only
-	 * returns when the publish operation is complete or a timeout occurs. */
-	xResult = IotMqtt_PublishSync( xMQTTConnection,
-								   &( xMQTTPublishInfo ),
-								   0, /* flags - currently ignored. */
-								   mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvMQTTUnsubscribe( void )
-{
-IotMqttError_t xResult;
-IotMqttSubscription_t xMQTTSubscription;
-
-	/* Unsubscribe from the mqttexampleTOPIC topic filter. */
-	xMQTTSubscription.pTopicFilter = mqttexampleTOPIC;
-	xMQTTSubscription.topicFilterLength = ( uint16_t ) strlen( mqttexampleTOPIC );
-
-	/* The following members of the IotMqttSubscription_t are ignored by the
-	 * unsubscribe operation. Just initialize them to avoid "use of uninitialized
-	 * variable" warnings. */
-	xMQTTSubscription.qos = IOT_MQTT_QOS_1;
-	xMQTTSubscription.callback.pCallbackContext = NULL;
-	xMQTTSubscription.callback.function = NULL;
-
-	/* Use the synchronous API to unsubscribe - It is a blocking call and only
-	 * returns when the unsubscribe operation is complete or a timeout occurs. */
-	xResult = IotMqtt_UnsubscribeSync( xMQTTConnection,
-									   &( xMQTTSubscription ),
-									   1, /* We are unsubscribing from one topic filter. */
-									   0, /* flags - currently ignored. */
-									   mqttexampleMQTT_TIMEOUT_MS );
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
-
-static void prvInitialiseLibraries( void )
-{
-IotMqttError_t xResult;
-IotNetworkError_t xNetworkResult;     /*_RB_ Are three types necessary, one for each lib? */
-
-	/* Initialize the network stack abstraction for FreeRTOS. */
-	xNetworkResult = IotNetworkFreeRTOS_Init();
-	configASSERT( xNetworkResult == IOT_NETWORK_SUCCESS );
-
-	/* MQTT library must be initialized before it can be used. This is just one
-	 * time initialization. */
-	xResult = IotMqtt_Init();
-	configASSERT( xResult == IOT_MQTT_SUCCESS );
-}
-/*-----------------------------------------------------------*/
diff --git a/FreeRTOS-Plus/Demo/readme.txt b/FreeRTOS-Plus/Demo/readme.txt
index 1caf978e2..9c6dfc90f 100755
--- a/FreeRTOS-Plus/Demo/readme.txt
+++ b/FreeRTOS-Plus/Demo/readme.txt
@@ -35,12 +35,12 @@ following links:
 The Visual Studio projects for each of the FreeRTOS IoT library examples are
 located in sub-directories of the following top-level directories:
 
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11
 
 
 *** ADDITIONAL INFORMATION ***
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/directories.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/directories.txt
index fc33d976c..fc33d976c 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/directories.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/directories.txt
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/mbedtls/mbedtls_platform_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/mbedtls/mbedtls_platform_freertos.c
index bdb2e04ba..bdb2e04ba 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/mbedtls/mbedtls_platform_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/mbedtls/mbedtls_platform_freertos.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/mbedtls/threading_alt.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/mbedtls/threading_alt.h
index c3a980e31..c3a980e31 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/mbedtls/threading_alt.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/mbedtls/threading_alt.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/include/platform/iot_network_freertos.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/include/platform/iot_network_freertos.h
index ce1c76e57..ce1c76e57 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/include/platform/iot_network_freertos.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/include/platform/iot_network_freertos.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/include/platform/iot_platform_types_freertos.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/include/platform/iot_platform_types_freertos.h
index e85e6b396..e85e6b396 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/include/platform/iot_platform_types_freertos.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/include/platform/iot_platform_types_freertos.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_clock_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_clock_freertos.c
index e2fee08d3..e2fee08d3 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_clock_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_clock_freertos.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_network_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_network_freertos.c
index ce2f2e943..9ee3f7769 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_network_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_network_freertos.c
@@ -44,7 +44,7 @@
 #include "FreeRTOS_IP.h"
 #include "FreeRTOS_Sockets.h"
 
-/* FreeRTOS-IoT-Libraries includes. */
+/* FreeRTOS-IoT-Libraries-LTS-Beta1 includes. */
 #include "iot_error.h"
 #include "platform/iot_network_freertos.h"
 
@@ -93,11 +93,11 @@
  * Per https://tools.ietf.org/html/rfc1035, 253 is the maximum string length
  * of a DNS name.
  */
-#define MAX_DNS_NAME_LENGTH    ( 253 )
+#define MAX_DNS_NAME_LENGTH                 ( 253 )
 
 /**
  * @brief Socket timeout in ticks.
- * 
+ *
  * The FreeRTOS APIs take a timeout in clock ticks.
  */
 #define IOT_NETWORK_SOCKET_TIMEOUT_TICKS    ( pdMS_TO_TICKS( IOT_NETWORK_SOCKET_TIMEOUT_MS ) )
@@ -110,7 +110,7 @@
  * to ensure that if one FreeRTOS_select() or related API call times out, the other
  * API calls waiting for the mutex still have time left to execute.
  */
-#define SOCKETSET_MUTEX_TIMEOUT_TICKS      ( pdMS_TO_TICKS( IOT_NETWORK_SOCKET_TIMEOUT_MS * 2 ) )
+#define SOCKETSET_MUTEX_TIMEOUT_TICKS       ( pdMS_TO_TICKS( IOT_NETWORK_SOCKET_TIMEOUT_MS * 2 ) )
 
 /*-----------------------------------------------------------*/
 
@@ -168,20 +168,20 @@ static TaskHandle_t _networkTaskHandle;
 static SocketSet_t _socketSet;
 
 /**
-* @brief Mutex used to serialize access to FreeRTOS_select and related APIs.
-*
-* We call FreeRTOS_FD_SET() from the application task and FreeRTOS_select()
-* from the network task for the same socket set. These APIs are not thread
-* safe as of the current implementation. This mutex serializes access to
-* these APIs to ensure that these are not called simultaneously from multiple
-* threads.
-*/
+ * @brief Mutex used to serialize access to FreeRTOS_select and related APIs.
+ *
+ * We call FreeRTOS_FD_SET() from the application task and FreeRTOS_select()
+ * from the network task for the same socket set. These APIs are not thread
+ * safe as of the current implementation. This mutex serializes access to
+ * these APIs to ensure that these are not called simultaneously from multiple
+ * threads.
+ */
 static SemaphoreHandle_t _socketSetMutex;
 
 /**
  * @brief Storage space for _socketSetMutex.
  */
-static StaticSemaphore_t _socketSetMutexStorage;        
+static StaticSemaphore_t _socketSetMutexStorage;
 
 /**
  * @brief Connections in _socketSet.
@@ -455,15 +455,15 @@ static void _networkTask( void * pvParameters )
                 /* The usage of this routine must be serialized with FreeRTOS_FD_SET()
                  * because it blocks the caller on same synchronization object that
                  * FreeRTOS_FD_SET() blocks on. */
-                socketEvents = FreeRTOS_select( socketSet, 
+                socketEvents = FreeRTOS_select( socketSet,
                                                 IOT_NETWORK_SOCKET_TIMEOUT_TICKS );
                 xSemaphoreGive( _socketSetMutex );
 
                 /* This task must delay a bit so that any other waiting task, that
                  * might be the same priority or lower, may grab the _socketSetMutex
                  * before this task's next iteration. */
-                vTaskDelay(1);
-            }        
+                vTaskDelay( 1 );
+            }
             else
             {
                 IotLogError( "Failed to obtain _socketSetMutex required to call FreeRTOS_select()." );
@@ -510,9 +510,9 @@ IotNetworkError_t IotNetworkFreeRTOS_Init( void )
 {
     IOT_FUNCTION_ENTRY( IotNetworkError_t, IOT_NETWORK_SUCCESS );
 
-    /* Initialize the network connections in the socket set. If this array is 
+    /* Initialize the network connections in the socket set. If this array is
      * all NULL then that means there are no active sockets. */
-    memset( _connections, ( int )NULL, sizeof( _connections ) );
+    memset( _connections, ( int ) NULL, sizeof( _connections ) );
 
     #if ( IOT_NETWORK_ENABLE_TLS == 1 )
         int mbedtlsError = 0;
@@ -761,7 +761,7 @@ IotNetworkError_t IotNetworkFreeRTOS_SetReceiveCallback( IotNetworkConnection_t
     else
     {
         /* Add this socket to the socket set for the network task. */
-        if( xSemaphoreTake( _socketSetMutex, 
+        if( xSemaphoreTake( _socketSetMutex,
                             SOCKETSET_MUTEX_TIMEOUT_TICKS ) == pdTRUE )
         {
             /* The usage of this routine must be serialized with FreeRTOS_select()
@@ -884,7 +884,7 @@ size_t IotNetworkFreeRTOS_Receive( IotNetworkConnection_t pConnection,
                 else
                 {
                     /* Could not obtain socket mutex, exit. */
-                     IotLogDebug( "Could not obtain the socketMutex needed for receive." );
+                    IotLogDebug( "Could not obtain the socketMutex needed for receive." );
                     break;
                 }
             }
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_network_pkcs11_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_network_pkcs11_freertos.c
index 853964207..2b107d57d 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_network_pkcs11_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_network_pkcs11_freertos.c
@@ -45,7 +45,7 @@
 #include "FreeRTOS_IP.h"
 #include "FreeRTOS_Sockets.h"
 
-/* FreeRTOS-IoT-Libraries includes. */
+/* FreeRTOS-IoT-Libraries-LTS-Beta1 includes. */
 #include "iot_error.h"
 #include "platform/iot_network_freertos.h"
 #include "mbedtls/threading.h"
@@ -55,32 +55,32 @@
 
 /* Configure logs for the functions in this file. */
 #ifdef IOT_LOG_LEVEL_NETWORK
-#define LIBRARY_LOG_LEVEL IOT_LOG_LEVEL_NETWORK
+    #define LIBRARY_LOG_LEVEL        IOT_LOG_LEVEL_NETWORK
 #else
-#ifdef IOT_LOG_LEVEL_GLOBAL
-#define LIBRARY_LOG_LEVEL IOT_LOG_LEVEL_GLOBAL
-#else
-#define LIBRARY_LOG_LEVEL IOT_LOG_NONE
-#endif
+    #ifdef IOT_LOG_LEVEL_GLOBAL
+        #define LIBRARY_LOG_LEVEL    IOT_LOG_LEVEL_GLOBAL
+    #else
+        #define LIBRARY_LOG_LEVEL    IOT_LOG_NONE
+    #endif
 #endif
 
-#define LIBRARY_LOG_NAME ("NET")
+#define LIBRARY_LOG_NAME    ( "NET" )
 #include "iot_logging_setup.h"
 
 /* Provide a default value for socket timeout and network task parameters. */
 #ifndef IOT_NETWORK_SOCKET_TIMEOUT_MS
-#define IOT_NETWORK_SOCKET_TIMEOUT_MS (5000)
+    #define IOT_NETWORK_SOCKET_TIMEOUT_MS    ( 5000 )
 #endif
 #ifndef IOT_NETWORK_TASK_STACK_SIZE
-#define IOT_NETWORK_TASK_STACK_SIZE (2048)
+    #define IOT_NETWORK_TASK_STACK_SIZE      ( 2048 )
 #endif
 #ifndef IOT_NETWORK_TASK_PRIORITY
-#define IOT_NETWORK_TASK_PRIORITY (tskIDLE_PRIORITY)
+    #define IOT_NETWORK_TASK_PRIORITY        ( tskIDLE_PRIORITY )
 #endif
 
 /* Maximum number of simultaneous socket receive callbacks. */
 #ifndef IOT_NETWORK_MAX_RECEIVE_CALLBACKS
-#define IOT_NETWORK_MAX_RECEIVE_CALLBACKS (2)
+    #define IOT_NETWORK_MAX_RECEIVE_CALLBACKS    ( 2 )
 #endif
 
 /**
@@ -89,23 +89,24 @@
  * Per https://tools.ietf.org/html/rfc1035, 253 is the maximum string length
  * of a DNS name.
  */
-#define MAX_DNS_NAME_LENGTH (253)
+#define MAX_DNS_NAME_LENGTH    ( 253 )
 /*-----------------------------------------------------------*/
 
 /**
  * @brief Internal network context.
  */
-typedef struct _networkConnection {
+typedef struct _networkConnection
+{
     Socket_t socket;               /**< @brief FreeRTOS+TCP sockets handle. */
     SemaphoreHandle_t socketMutex; /**< @brief Prevents concurrent threads from
-                                      using a socket. */
+                                    * using a socket. */
     StaticSemaphore_t
-        socketMutexStorage; /**< @brief Storage space for socketMutex. */
+        socketMutexStorage;        /**< @brief Storage space for socketMutex. */
     IotNetworkReceiveCallback_t
-        receiveCallback;   /**< @brief Network receive callback, if any. */
-    void* pReceiveContext; /**< @brief The context for the receive callback. */
-    void* pvTLSContext;    /**< @brief TLS handle. */
-    BaseType_t secured; /**< @brief Flag that marks a connection as secured. */
+        receiveCallback;           /**< @brief Network receive callback, if any. */
+    void * pReceiveContext;        /**< @brief The context for the receive callback. */
+    void * pvTLSContext;           /**< @brief TLS handle. */
+    BaseType_t secured;            /**< @brief Flag that marks a connection as secured. */
 } _networkConnection_t;
 /*-----------------------------------------------------------*/
 
@@ -122,19 +123,21 @@ static SocketSet_t _socketSet;
 /**
  * @brief Connections in _socketSet.
  */
-static _networkConnection_t* _connections[IOT_NETWORK_MAX_RECEIVE_CALLBACKS];
+static _networkConnection_t * _connections[ IOT_NETWORK_MAX_RECEIVE_CALLBACKS ];
 
 /**
  * @brief An #IotNetworkInterface_t that uses the functions in this file.
  */
-const IotNetworkInterface_t IotNetworkFreeRTOS = {
-    .create = IotNetworkFreeRTOS_Create,
+const IotNetworkInterface_t IotNetworkFreeRTOS =
+{
+    .create             = IotNetworkFreeRTOS_Create,
     .setReceiveCallback = IotNetworkFreeRTOS_SetReceiveCallback,
-    .send = IotNetworkFreeRTOS_Send,
-    .receive = IotNetworkFreeRTOS_Receive,
-    .receiveUpto = IotNetworkFreeRTOS_ReceiveUpto,
-    .close = IotNetworkFreeRTOS_Close,
-    .destroy = IotNetworkFreeRTOS_Destroy};
+    .send               = IotNetworkFreeRTOS_Send,
+    .receive            = IotNetworkFreeRTOS_Receive,
+    .receiveUpto        = IotNetworkFreeRTOS_ReceiveUpto,
+    .close              = IotNetworkFreeRTOS_Close,
+    .destroy            = IotNetworkFreeRTOS_Destroy
+};
 /*-----------------------------------------------------------*/
 
 /**
@@ -147,72 +150,82 @@ const IotNetworkInterface_t IotNetworkFreeRTOS = {
  * @return #IOT_NETWORK_SUCCESS, #IOT_NETWORK_FAILURE, #IOT_NETWORK_NO_MEMORY,
  * or #IOT_NETWORK_SYSTEM_ERROR.
  */
-static IotNetworkError_t _tlsSetup(
-    _networkConnection_t* pNetworkConnection, const char* pServerName,
-    IotNetworkCredentials_t pCredentials)
+static IotNetworkError_t _tlsSetup( _networkConnection_t * pNetworkConnection,
+                                    const char * pServerName,
+                                    IotNetworkCredentials_t pCredentials )
 {
     int mbedtlsError = 0;
 
-    TLSParams_t tlsParams = {0};
+    TLSParams_t tlsParams = { 0 };
 
-    tlsParams.ulSize = sizeof(tlsParams);
+    tlsParams.ulSize = sizeof( tlsParams );
     tlsParams.pcDestination = pServerName;
     tlsParams.pcServerCertificate = pCredentials->pRootCa;
     tlsParams.ulServerCertificateLength = pCredentials->rootCaSize;
-    tlsParams.ppcAlpnProtocols = (const char**)pCredentials->pAlpnProtos;
+    tlsParams.ppcAlpnProtocols = ( const char ** ) pCredentials->pAlpnProtos;
     tlsParams.ulAlpnProtocolsCount = 0;
     tlsParams.pxNetworkSend = mbedtls_platform_send;
     tlsParams.pxNetworkRecv = mbedtls_platform_recv;
     tlsParams.pvCallerContext = pNetworkConnection->socket;
 
     /* Initialize TLS context and underlying crypto libraries */
-    mbedtlsError = TLS_Init(&pNetworkConnection->pvTLSContext, &tlsParams);
-    if (mbedtlsError != CKR_OK) {
-        IotLogError("Failed to initialize TLS, error %d", mbedtlsError);
+    mbedtlsError = TLS_Init( &pNetworkConnection->pvTLSContext, &tlsParams );
+
+    if( mbedtlsError != CKR_OK )
+    {
+        IotLogError( "Failed to initialize TLS, error %d", mbedtlsError );
     }
 
     /* Attempt to establish a TLS connection. PKCS is used to acquire
-        * credential objects. */
-    mbedtlsError = TLS_Connect(pNetworkConnection->pvTLSContext);
+     * credential objects. */
+    mbedtlsError = TLS_Connect( pNetworkConnection->pvTLSContext );
 
-    if (mbedtlsError == CKR_OK) {
+    if( mbedtlsError == CKR_OK )
+    {
         pNetworkConnection->secured = pdTRUE;
-        IotLogInfo("TLS Handshake sucecessful.");
-    } else {
+        IotLogInfo( "TLS Handshake sucecessful." );
+    }
+    else
+    {
         IotLogError(
-            "Failed to perform TLS handshake, error %d.", mbedtlsError);
-        TLS_Cleanup(pNetworkConnection->pvTLSContext);
+            "Failed to perform TLS handshake, error %d.", mbedtlsError );
+        TLS_Cleanup( pNetworkConnection->pvTLSContext );
     }
 
     return mbedtlsError;
 }
 /*-----------------------------------------------------------*/
 
-static void _networkTask(void* pvParameters)
+static void _networkTask( void * pvParameters )
 {
-    _networkConnection_t* pConnection = NULL;
+    _networkConnection_t * pConnection = NULL;
     BaseType_t socketEvents = 0, i = 0, socketStatus = 0;
     SocketSet_t socketSet = pvParameters;
 
-    while (true) {
+    while( true )
+    {
         socketEvents =
-            FreeRTOS_select(socketSet, IOT_NETWORK_SOCKET_TIMEOUT_MS);
+            FreeRTOS_select( socketSet, IOT_NETWORK_SOCKET_TIMEOUT_MS );
 
-        if (socketEvents > 0) {
-            for (i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++) {
-                pConnection = _connections[i];
+        if( socketEvents > 0 )
+        {
+            for( i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++ )
+            {
+                pConnection = _connections[ i ];
 
-                if (pConnection != NULL) {
+                if( pConnection != NULL )
+                {
                     socketStatus =
-                        FreeRTOS_FD_ISSET(pConnection->socket, socketSet);
+                        FreeRTOS_FD_ISSET( pConnection->socket, socketSet );
 
-                    if (socketStatus & eSELECT_READ) {
+                    if( socketStatus & eSELECT_READ )
+                    {
                         /* A receive callback must be set; otherwise, select
                          * should not have returned this socket. */
-                        configASSERT(pConnection->receiveCallback != NULL);
+                        configASSERT( pConnection->receiveCallback != NULL );
 
                         pConnection->receiveCallback(
-                            pConnection, pConnection->pReceiveContext);
+                            pConnection, pConnection->pReceiveContext );
                     }
                 }
             }
@@ -220,170 +233,182 @@ static void _networkTask(void* pvParameters)
 
         /* This task will receive a notification when cleanup is called. Exit
          * when cleanup is called. */
-        if (ulTaskNotifyTake(pdTRUE, 0) != 0) {
+        if( ulTaskNotifyTake( pdTRUE, 0 ) != 0 )
+        {
             break;
         }
     }
 
-    FreeRTOS_DeleteSocketSet(socketSet);
-    vTaskDelete(NULL);
+    FreeRTOS_DeleteSocketSet( socketSet );
+    vTaskDelete( NULL );
 }
 /*-----------------------------------------------------------*/
 
-IotNetworkError_t IotNetworkFreeRTOS_Init(void)
+IotNetworkError_t IotNetworkFreeRTOS_Init( void )
 {
-    IOT_FUNCTION_ENTRY(IotNetworkError_t, IOT_NETWORK_SUCCESS);
+    IOT_FUNCTION_ENTRY( IotNetworkError_t, IOT_NETWORK_SUCCESS );
 
     /* Create socket set for network task. */
     _socketSet = FreeRTOS_CreateSocketSet();
 
-    if (_socketSet == NULL) {
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_FAILURE);
+    if( _socketSet == NULL )
+    {
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_FAILURE );
     }
 
     static StaticTask_t networkTask;
-    static StackType_t networkTaskStack[IOT_NETWORK_TASK_STACK_SIZE];
+    static StackType_t networkTaskStack[ IOT_NETWORK_TASK_STACK_SIZE ];
 
     /* Create the network task. Since valid parameters are provided, this should
      * never fail. */
     _networkTaskHandle = xTaskCreateStatic(
         _networkTask, "Network", IOT_NETWORK_TASK_STACK_SIZE, _socketSet,
-        IOT_NETWORK_TASK_PRIORITY, (StackType_t* const) & networkTaskStack,
-        &networkTask);
-    configASSERT(_networkTaskHandle != NULL);
+        IOT_NETWORK_TASK_PRIORITY, ( StackType_t * const ) &networkTaskStack,
+        &networkTask );
+    configASSERT( _networkTaskHandle != NULL );
 
-    IotLogInfo("Network successfully initialized.");
+    IotLogInfo( "Network successfully initialized." );
 
     IOT_FUNCTION_EXIT_NO_CLEANUP();
 }
 /*-----------------------------------------------------------*/
 
-void IotNetworkFreeRTOS_Cleanup(void)
+void IotNetworkFreeRTOS_Cleanup( void )
 {
+    xTaskNotifyGive( _networkTaskHandle );
 
-    xTaskNotifyGive(_networkTaskHandle);
-
-    IotLogInfo("Network cleanup done.");
+    IotLogInfo( "Network cleanup done." );
 }
 /*-----------------------------------------------------------*/
 
-IotNetworkError_t IotNetworkFreeRTOS_Create(
-    IotNetworkServerInfo_t pServerInfo, IotNetworkCredentials_t pCredentialInfo,
-    IotNetworkConnection_t* pConnection)
+IotNetworkError_t IotNetworkFreeRTOS_Create( IotNetworkServerInfo_t pServerInfo,
+                                             IotNetworkCredentials_t pCredentialInfo,
+                                             IotNetworkConnection_t * pConnection )
 {
-    IOT_FUNCTION_ENTRY(IotNetworkError_t, IOT_NETWORK_SUCCESS);
+    IOT_FUNCTION_ENTRY( IotNetworkError_t, IOT_NETWORK_SUCCESS );
     Socket_t tcpSocket = FREERTOS_INVALID_SOCKET;
     BaseType_t socketStatus = 0;
-    struct freertos_sockaddr serverAddress = {0};
+    struct freertos_sockaddr serverAddress = { 0 };
     const TickType_t receiveTimeout =
-        pdMS_TO_TICKS(IOT_NETWORK_SOCKET_TIMEOUT_MS);
-    _networkConnection_t* pNewNetworkConnection = NULL;
+        pdMS_TO_TICKS( IOT_NETWORK_SOCKET_TIMEOUT_MS );
+    _networkConnection_t * pNewNetworkConnection = NULL;
 
     /* Credentials are not used if TLS is disabled. */
-    (void)pCredentialInfo;
+    ( void ) pCredentialInfo;
 
     /* Check host name length against the maximum length allowed. */
-    const size_t hostnameLength = strlen(pServerInfo->pHostName);
+    const size_t hostnameLength = strlen( pServerInfo->pHostName );
 
-    if (hostnameLength > (size_t)MAX_DNS_NAME_LENGTH) {
+    if( hostnameLength > ( size_t ) MAX_DNS_NAME_LENGTH )
+    {
         IotLogError(
             "Host name length exceeds %d, which is the maximum allowed.",
-            MAX_DNS_NAME_LENGTH);
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_BAD_PARAMETER);
+            MAX_DNS_NAME_LENGTH );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_BAD_PARAMETER );
     }
 
-    pNewNetworkConnection = pvPortMalloc(sizeof(_networkConnection_t));
+    pNewNetworkConnection = pvPortMalloc( sizeof( _networkConnection_t ) );
 
-    if (pNewNetworkConnection == NULL) {
-        IotLogError("Failed to allocate memory for new network connection.");
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_NO_MEMORY);
+    if( pNewNetworkConnection == NULL )
+    {
+        IotLogError( "Failed to allocate memory for new network connection." );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_NO_MEMORY );
     }
 
     /* Clear the connection information. */
-    (void)memset(pNewNetworkConnection, 0x00, sizeof(_networkConnection_t));
+    ( void ) memset( pNewNetworkConnection, 0x00, sizeof( _networkConnection_t ) );
 
     /* Create a new TCP socket. */
     tcpSocket = FreeRTOS_socket(
-        FREERTOS_AF_INET, FREERTOS_SOCK_STREAM, FREERTOS_IPPROTO_TCP);
+        FREERTOS_AF_INET, FREERTOS_SOCK_STREAM, FREERTOS_IPPROTO_TCP );
 
-    if (tcpSocket == FREERTOS_INVALID_SOCKET) {
-        IotLogError("Failed to create new socket.");
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_SYSTEM_ERROR);
+    if( tcpSocket == FREERTOS_INVALID_SOCKET )
+    {
+        IotLogError( "Failed to create new socket." );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_SYSTEM_ERROR );
     }
 
     /* Set the timeout for receive. */
     socketStatus = FreeRTOS_setsockopt(
         tcpSocket, 0, FREERTOS_SO_RCVTIMEO, &receiveTimeout,
-        sizeof(TickType_t));
+        sizeof( TickType_t ) );
 
-    if (socketStatus != 0) {
-        IotLogError("Failed to set socket receive timeout.");
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_SYSTEM_ERROR);
+    if( socketStatus != 0 )
+    {
+        IotLogError( "Failed to set socket receive timeout." );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_SYSTEM_ERROR );
     }
 
     /* Establish connection. */
     serverAddress.sin_family = FREERTOS_AF_INET;
-    serverAddress.sin_port = FreeRTOS_htons(pServerInfo->port);
-    serverAddress.sin_addr = FreeRTOS_gethostbyname(pServerInfo->pHostName);
-    serverAddress.sin_len = (uint8_t)sizeof(serverAddress);
+    serverAddress.sin_port = FreeRTOS_htons( pServerInfo->port );
+    serverAddress.sin_addr = FreeRTOS_gethostbyname( pServerInfo->pHostName );
+    serverAddress.sin_len = ( uint8_t ) sizeof( serverAddress );
 
     /* Check for errors from DNS lookup. */
-    if (serverAddress.sin_addr == 0) {
-        IotLogError("Failed to resolve %s.", pServerInfo->pHostName);
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_SYSTEM_ERROR);
+    if( serverAddress.sin_addr == 0 )
+    {
+        IotLogError( "Failed to resolve %s.", pServerInfo->pHostName );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_SYSTEM_ERROR );
     }
 
     socketStatus =
-        FreeRTOS_connect(tcpSocket, &serverAddress, sizeof(serverAddress));
+        FreeRTOS_connect( tcpSocket, &serverAddress, sizeof( serverAddress ) );
 
-    if (socketStatus != 0) {
+    if( socketStatus != 0 )
+    {
         IotLogError(
             "Failed to establish new connection. Socket status %d.",
-            socketStatus);
-        IOT_SET_AND_GOTO_CLEANUP(IOT_NETWORK_SYSTEM_ERROR);
+            socketStatus );
+        IOT_SET_AND_GOTO_CLEANUP( IOT_NETWORK_SYSTEM_ERROR );
     }
 
     /* Set the socket. */
     pNewNetworkConnection->socket = tcpSocket;
     /* Create the socket mutex. */
     pNewNetworkConnection->socketMutex = xSemaphoreCreateMutexStatic(
-        &(pNewNetworkConnection->socketMutexStorage));
+        &( pNewNetworkConnection->socketMutexStorage ) );
 
     /* Set up TLS if credentials are provided. */
-    if (pCredentialInfo != NULL) {
+    if( pCredentialInfo != NULL )
+    {
         status = _tlsSetup(
-            pNewNetworkConnection, pServerInfo->pHostName, pCredentialInfo);
+            pNewNetworkConnection, pServerInfo->pHostName, pCredentialInfo );
     }
 
     IOT_FUNCTION_CLEANUP_BEGIN();
 
     /* Clean up on failure. */
-    if (status != IOT_NETWORK_SUCCESS) {
-        if (tcpSocket != FREERTOS_INVALID_SOCKET) {
-            FreeRTOS_closesocket(tcpSocket);
+    if( status != IOT_NETWORK_SUCCESS )
+    {
+        if( tcpSocket != FREERTOS_INVALID_SOCKET )
+        {
+            FreeRTOS_closesocket( tcpSocket );
         }
 
         /* Clear the connection information. */
-        if (pNewNetworkConnection != NULL) {
-            vPortFree(pNewNetworkConnection);
+        if( pNewNetworkConnection != NULL )
+        {
+            vPortFree( pNewNetworkConnection );
         }
-    } else {
-
+    }
+    else
+    {
         /* Set the output parameter. */
         *pConnection = pNewNetworkConnection;
 
         IotLogInfo(
             "(Network connection %p) Connection to %s established.",
-            pNewNetworkConnection, pServerInfo->pHostName);
+            pNewNetworkConnection, pServerInfo->pHostName );
     }
 
     IOT_FUNCTION_CLEANUP_END();
 }
 /*-----------------------------------------------------------*/
 
-IotNetworkError_t IotNetworkFreeRTOS_SetReceiveCallback(
-    IotNetworkConnection_t pConnection,
-    IotNetworkReceiveCallback_t receiveCallback, void* pContext)
+IotNetworkError_t IotNetworkFreeRTOS_SetReceiveCallback( IotNetworkConnection_t pConnection,
+                                                         IotNetworkReceiveCallback_t receiveCallback,
+                                                         void * pContext )
 {
     IotNetworkError_t status = IOT_NETWORK_SUCCESS;
     BaseType_t i = 0;
@@ -394,105 +419,129 @@ IotNetworkError_t IotNetworkFreeRTOS_SetReceiveCallback(
 
     /* Add this connection to the list of connections that select should check.
      */
-    for (i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++) {
-        if (Atomic_CompareAndSwapPointers_p32(
-                &_connections[i], pConnection, NULL)
-            == 1) {
+    for( i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++ )
+    {
+        if( Atomic_CompareAndSwapPointers_p32(
+                &_connections[ i ], pConnection, NULL )
+            == 1 )
+        {
             break;
         }
     }
 
-    if (i == IOT_NETWORK_MAX_RECEIVE_CALLBACKS) {
+    if( i == IOT_NETWORK_MAX_RECEIVE_CALLBACKS )
+    {
         status = IOT_NETWORK_NO_MEMORY;
-    } else {
+    }
+    else
+    {
         /* Add this socket to the socket set for the network task. */
-        FreeRTOS_FD_SET(pConnection->socket, _socketSet, eSELECT_READ);
+        FreeRTOS_FD_SET( pConnection->socket, _socketSet, eSELECT_READ );
     }
 
     return status;
 }
 /*-----------------------------------------------------------*/
 
-size_t IotNetworkFreeRTOS_Send(
-    IotNetworkConnection_t pConnection, const uint8_t* pMessage,
-    size_t messageLength)
+size_t IotNetworkFreeRTOS_Send( IotNetworkConnection_t pConnection,
+                                const uint8_t * pMessage,
+                                size_t messageLength )
 {
     size_t bytesSent = 0;
     BaseType_t socketStatus = 0;
 
     /* Only one thread at a time may send on the connection. Lock the send
      * mutex to prevent other threads from sending. */
-    if (xSemaphoreTake(pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS)
-        == pdTRUE) {
-
-        if (pConnection->secured == pdTRUE) {
+    if( xSemaphoreTake( pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS )
+        == pdTRUE )
+    {
+        if( pConnection->secured == pdTRUE )
+        {
             socketStatus =
-                TLS_Send(pConnection->pvTLSContext, pMessage, messageLength);
-        } else {
+                TLS_Send( pConnection->pvTLSContext, pMessage, messageLength );
+        }
+        else
+        {
             IotLogError(
                 "Attempted to send data over a TLS connection that is "
-                "insecure.");
+                "insecure." );
+        }
+
+        if( socketStatus > 0 )
+        {
+            bytesSent = ( size_t ) socketStatus;
         }
-        if (socketStatus > 0) {
-            bytesSent = (size_t)socketStatus;
-        } else {
+        else
+        {
             IotLogError(
                 "Failed to send data over TLS connection with error code %d.",
-                socketStatus);
+                socketStatus );
         }
 
-        xSemaphoreGive(pConnection->socketMutex);
+        xSemaphoreGive( pConnection->socketMutex );
     }
 
     IotLogDebug(
         "(Network connection %p) Sent %lu bytes.", pConnection,
-        (unsigned long)bytesSent);
+        ( unsigned long ) bytesSent );
 
     return bytesSent;
 }
 /*-----------------------------------------------------------*/
 
-size_t IotNetworkFreeRTOS_Receive(
-    IotNetworkConnection_t pConnection, uint8_t* pBuffer, size_t bytesRequested)
+size_t IotNetworkFreeRTOS_Receive( IotNetworkConnection_t pConnection,
+                                   uint8_t * pBuffer,
+                                   size_t bytesRequested )
 {
     BaseType_t socketStatus = 0;
     size_t bytesReceived = 0, bytesRemaining = bytesRequested;
 
     /* Block and wait for incoming data. */
 
-    if (pConnection->secured == pdTRUE) {
-        if (xSemaphoreTake(
-                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS)
-            == pdTRUE) {
+    if( pConnection->secured == pdTRUE )
+    {
+        if( xSemaphoreTake(
+                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS )
+            == pdTRUE )
+        {
             socketStatus =
-                TLS_Recv(pConnection->pvTLSContext, pBuffer, bytesRequested);
-            if (socketStatus > 0) {
-                bytesReceived = (size_t)socketStatus;
-            } else {
+                TLS_Recv( pConnection->pvTLSContext, pBuffer, bytesRequested );
+
+            if( socketStatus > 0 )
+            {
+                bytesReceived = ( size_t ) socketStatus;
+            }
+            else
+            {
                 IotLogError(
                     "Failed to recieve data over TLS connection with error "
                     "code "
                     "%d.",
-                    socketStatus);
+                    socketStatus );
             }
-            xSemaphoreGive(pConnection->socketMutex);
-        }
 
-    } else {
+            xSemaphoreGive( pConnection->socketMutex );
+        }
+    }
+    else
+    {
         IotLogError(
-            "Attempted to send data over a TLS connection that is insecure.");
+            "Attempted to send data over a TLS connection that is insecure." );
     }
 
-    if (bytesReceived < bytesRequested) {
+    if( bytesReceived < bytesRequested )
+    {
         IotLogWarn(
             "(Network connection %p) Receive requested %lu bytes, but %lu "
             "bytes received instead.",
-            pConnection, (unsigned long)bytesRequested,
-            (unsigned long)bytesReceived);
-    } else {
+            pConnection, ( unsigned long ) bytesRequested,
+            ( unsigned long ) bytesReceived );
+    }
+    else
+    {
         IotLogDebug(
             "(Network connection %p) Successfully received %lu bytes.",
-            pConnection, (unsigned long)bytesRequested);
+            pConnection, ( unsigned long ) bytesRequested );
     }
 
     return bytesReceived;
@@ -500,83 +549,97 @@ size_t IotNetworkFreeRTOS_Receive(
 
 /*-----------------------------------------------------------*/
 
-size_t IotNetworkFreeRTOS_ReceiveUpto(
-    IotNetworkConnection_t pConnection, uint8_t* pBuffer, size_t bufferSize)
+size_t IotNetworkFreeRTOS_ReceiveUpto( IotNetworkConnection_t pConnection,
+                                       uint8_t * pBuffer,
+                                       size_t bufferSize )
 {
     int32_t socketStatus = 0;
     size_t bytesReceived = 0;
 
     /* Caller should never pass a zero-length buffer. */
-    configASSERT(bufferSize > 0);
+    configASSERT( bufferSize > 0 );
 
-
-    if (pConnection->secured == pdTRUE) {
-        if (xSemaphoreTake(
-                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS)
-            == pdTRUE) {
+    if( pConnection->secured == pdTRUE )
+    {
+        if( xSemaphoreTake(
+                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS )
+            == pdTRUE )
+        {
             socketStatus =
-                TLS_Recv(pConnection->pvTLSContext, pBuffer, bufferSize);
+                TLS_Recv( pConnection->pvTLSContext, pBuffer, bufferSize );
             bytesReceived = socketStatus;
 
-            xSemaphoreGive(pConnection->socketMutex);
-        } else {
-            IotLogError("Could not obtain the socket mutex.");
+            xSemaphoreGive( pConnection->socketMutex );
         }
-    } else
+        else
+        {
+            IotLogError( "Could not obtain the socket mutex." );
+        }
+    }
+    else
 
     {
         IotLogError(
-            "Attempted to send data over a TLS connection that is insecure.");
+            "Attempted to send data over a TLS connection that is insecure." );
     }
 
-    if (socketStatus <= 0) {
-        IotLogError("Error %ld while receiving data.", (long int)socketStatus);
-    } else {
-        bytesReceived += (size_t)socketStatus;
+    if( socketStatus <= 0 )
+    {
+        IotLogError( "Error %ld while receiving data.", ( long int ) socketStatus );
+    }
+    else
+    {
+        bytesReceived += ( size_t ) socketStatus;
     }
 
-    IotLogDebug("Received %lu bytes.", (unsigned long)bytesReceived);
+    IotLogDebug( "Received %lu bytes.", ( unsigned long ) bytesReceived );
 
     return bytesReceived;
 }
 
 /*-----------------------------------------------------------*/
 
-IotNetworkError_t IotNetworkFreeRTOS_Close(IotNetworkConnection_t pConnection)
+IotNetworkError_t IotNetworkFreeRTOS_Close( IotNetworkConnection_t pConnection )
 {
     BaseType_t socketStatus = 0, i = 0;
 
 
     /* Notify the peer that the TLS connection is being closed. */
-    if (pConnection->secured == pdTRUE) {
-        if (xSemaphoreTake(
-                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS)
-            == pdTRUE) {
-
+    if( pConnection->secured == pdTRUE )
+    {
+        if( xSemaphoreTake(
+                pConnection->socketMutex, IOT_NETWORK_SOCKET_TIMEOUT_MS )
+            == pdTRUE )
+        {
             /* Clean up memory used by TLS Connection. */
-            TLS_Cleanup(pConnection->pvTLSContext);
+            TLS_Cleanup( pConnection->pvTLSContext );
             pConnection->pvTLSContext = NULL;
 
-            xSemaphoreGive(pConnection->socketMutex);
+            xSemaphoreGive( pConnection->socketMutex );
         }
     }
 
     /* Call socket shutdown function to close connection. */
-    socketStatus = FreeRTOS_shutdown(pConnection->socket, FREERTOS_SHUT_RDWR);
+    socketStatus = FreeRTOS_shutdown( pConnection->socket, FREERTOS_SHUT_RDWR );
 
-    if (socketStatus != 0) {
+    if( socketStatus != 0 )
+    {
         IotLogWarn(
-            "(Network connection %p) Failed to close connection.", pConnection);
-    } else {
-        IotLogInfo("(Network connection %p) Connection closed.", pConnection);
+            "(Network connection %p) Failed to close connection.", pConnection );
+    }
+    else
+    {
+        IotLogInfo( "(Network connection %p) Connection closed.", pConnection );
     }
 
     /* Remove this connection from Select's socket set (if present). */
-    for (i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++) {
-        if (Atomic_CompareAndSwapPointers_p32(
-                &_connections[i], NULL, pConnection)
-            == 1) {
-            FreeRTOS_FD_CLR(pConnection->socket, _socketSet, eSELECT_ALL);
+    for( i = 0; i < IOT_NETWORK_MAX_RECEIVE_CALLBACKS; i++ )
+    {
+        if( Atomic_CompareAndSwapPointers_p32(
+                &_connections[ i ], NULL, pConnection )
+            == 1 )
+        {
+            FreeRTOS_FD_CLR( pConnection->socket, _socketSet, eSELECT_ALL );
         }
     }
 
@@ -584,14 +647,14 @@ IotNetworkError_t IotNetworkFreeRTOS_Close(IotNetworkConnection_t pConnection)
 }
 /*-----------------------------------------------------------*/
 
-IotNetworkError_t IotNetworkFreeRTOS_Destroy(IotNetworkConnection_t pConnection)
+IotNetworkError_t IotNetworkFreeRTOS_Destroy( IotNetworkConnection_t pConnection )
 {
-    FreeRTOS_closesocket(pConnection->socket);
+    FreeRTOS_closesocket( pConnection->socket );
 
     /* Free memory used by network connection. */
-    vPortFree(pConnection);
+    vPortFree( pConnection );
 
-    IotLogInfo("(Network connection %p) Connection destroyed.", pConnection);
+    IotLogInfo( "(Network connection %p) Connection destroyed.", pConnection );
 
     return IOT_NETWORK_SUCCESS;
 }
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_threads_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_threads_freertos.c
index bb9124b61..bb9124b61 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/iot_threads_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/iot_threads_freertos.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/private/taskpool/taskpool_freertos.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/private/taskpool/taskpool_freertos.c
index 0d55dd2ac..0d55dd2ac 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/private/taskpool/taskpool_freertos.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/private/taskpool/taskpool_freertos.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/private/taskpool/taskpool_freertos.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/private/taskpool/taskpool_freertos.h
index b9ff81868..b9ff81868 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos/private/taskpool/taskpool_freertos.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos/private/taskpool/taskpool_freertos.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/include/iot_pkcs11_pal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/include/iot_pkcs11_pal.h
index b41e73958..b41e73958 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/include/iot_pkcs11_pal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/include/iot_pkcs11_pal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/src/iot_pkcs11_mbedtls.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/src/iot_pkcs11_mbedtls.c
index d2d628555..d2d628555 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/src/iot_pkcs11_mbedtls.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/src/iot_pkcs11_mbedtls.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/src/iot_pkcs11_pal.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/src/iot_pkcs11_pal.c
index e1a9f1bde..e1a9f1bde 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/src/iot_pkcs11_pal.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/src/iot_pkcs11_pal.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/pkcs11/include/iot_pkcs11.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/pkcs11/include/iot_pkcs11.h
index dd95d1a7d..dd95d1a7d 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/pkcs11/include/iot_pkcs11.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/pkcs11/include/iot_pkcs11.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/pkcs11/src/iot_pkcs11.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/pkcs11/src/iot_pkcs11.c
index 74d050695..74d050695 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/pkcs11/src/iot_pkcs11.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/pkcs11/src/iot_pkcs11.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/tls/include/iot_tls.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/tls/include/iot_tls.h
index b2b55da0d..b2b55da0d 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/tls/include/iot_tls.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/tls/include/iot_tls.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/tls/src/iot_tls.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/tls/src/iot_tls.c
index d1f743054..d1f743054 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/tls/src/iot_tls.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/tls/src/iot_tls.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/utils/include/iot_pki_utils.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/utils/include/iot_pki_utils.h
index a9836d6f8..a9836d6f8 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/utils/include/iot_pki_utils.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/utils/include/iot_pki_utils.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/utils/src/iot_pki_utils.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/utils/src/iot_pki_utils.c
index 642d4565a..642d4565a 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/abstractions/platform/freertos_plus/standard/utils/src/iot_pki_utils.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/abstractions/platform/freertos_plus/standard/utils/src/iot_pki_utils.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/include/aws_iot.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/include/aws_iot.h
index e63dcac35..e63dcac35 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/include/aws_iot.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/include/aws_iot.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/include/aws_iot_doc_parser.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/include/aws_iot_doc_parser.h
index 316d8a1f6..316d8a1f6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/include/aws_iot_doc_parser.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/include/aws_iot_doc_parser.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_doc_parser.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_doc_parser.c
index 921610440..921610440 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_doc_parser.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_doc_parser.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_operation.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_operation.c
index bf4472ace..bf4472ace 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_operation.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_operation.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_parser.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_parser.c
index d7b6ce0ed..d7b6ce0ed 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_parser.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_parser.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_subscription.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_subscription.c
index e0f76df67..e0f76df67 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_subscription.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_subscription.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_validate.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_validate.c
index e62525652..e62525652 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/common/src/aws_iot_validate.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/common/src/aws_iot_validate.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/directories.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/directories.txt
index 1673c8f04..1673c8f04 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/directories.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/directories.txt
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/AWS_IoT_Jobs.url b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/AWS_IoT_Jobs.url
index 7f34318d1..7f34318d1 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/AWS_IoT_Jobs.url
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/AWS_IoT_Jobs.url
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/include/aws_iot_jobs.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/include/aws_iot_jobs.h
index cb8dc4554..cb8dc4554 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/include/aws_iot_jobs.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/include/aws_iot_jobs.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/include/types/aws_iot_jobs_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/include/types/aws_iot_jobs_types.h
index 2a82e6960..2a82e6960 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/include/types/aws_iot_jobs_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/include/types/aws_iot_jobs_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_api.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_api.c
index a3ba636ed..a3ba636ed 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_api.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_operation.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_operation.c
index 8810d4606..8810d4606 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_operation.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_operation.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_serialize.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_serialize.c
index 6e0209957..6e0209957 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_serialize.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_serialize.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_static_memory.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_static_memory.c
index b5ddee558..b5ddee558 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_static_memory.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_static_memory.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_subscription.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_subscription.c
index 5fae60072..5fae60072 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/aws_iot_jobs_subscription.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/aws_iot_jobs_subscription.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/private/aws_iot_jobs_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/private/aws_iot_jobs_internal.h
index 370bb8e94..370bb8e94 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/jobs/src/private/aws_iot_jobs_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/jobs/src/private/aws_iot_jobs_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/include/aws_iot_ota_agent.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/include/aws_iot_ota_agent.h
index b929a8b02..b929a8b02 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/include/aws_iot_ota_agent.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/include/aws_iot_ota_agent.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/include/aws_iot_ota_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/include/aws_iot_ota_types.h
index b79512c6b..b79512c6b 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/include/aws_iot_ota_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/include/aws_iot_ota_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_agent.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_agent.c
index 2d63d128a..2d63d128a 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_agent.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_agent.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_agent_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_agent_internal.h
index 6c03fb41f..6c03fb41f 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_agent_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_agent_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_interface.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_interface.c
index 2f9b81ead..2f9b81ead 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_interface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_interface.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_interface.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_interface.h
index 0ab5abb5a..0ab5abb5a 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_interface.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_interface.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_pal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_pal.h
index 3b2f73f2a..3b2f73f2a 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/aws_iot_ota_pal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/aws_iot_ota_pal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/http/aws_iot_ota_http.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/http/aws_iot_ota_http.c
index d1a6b6b54..d1a6b6b54 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/http/aws_iot_ota_http.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/http/aws_iot_ota_http.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/http/aws_iot_ota_http.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/http/aws_iot_ota_http.h
index e7e775a78..e7e775a78 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/http/aws_iot_ota_http.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/http/aws_iot_ota_http.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.c
index 8bfa8a101..8bfa8a101 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.h
index 9e87e5790..9e87e5790 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor_internal.h
index 80fce43b7..80fce43b7 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_cbor_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
index 21ab6b010..21ab6b010 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.h
index 91cd09a63..91cd09a63 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/ota/src/mqtt/aws_iot_ota_mqtt.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/AWS_IoT_Shadow.url b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/AWS_IoT_Shadow.url
index f24163b5c..f24163b5c 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/AWS_IoT_Shadow.url
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/AWS_IoT_Shadow.url
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/include/aws_iot_shadow.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/include/aws_iot_shadow.h
index 2e00e976f..2e00e976f 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/include/aws_iot_shadow.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/include/aws_iot_shadow.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/include/types/aws_iot_shadow_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/include/types/aws_iot_shadow_types.h
index 46700f0b6..46700f0b6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/include/types/aws_iot_shadow_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/include/types/aws_iot_shadow_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_api.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_api.c
index d845e20f2..d845e20f2 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_api.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_operation.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_operation.c
index 49b38b1f7..49b38b1f7 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_operation.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_operation.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_parser.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_parser.c
index f079dd4ea..f079dd4ea 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_parser.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_parser.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_static_memory.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_static_memory.c
index 98dd9273d..98dd9273d 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_static_memory.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_static_memory.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_subscription.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_subscription.c
index fd15a7054..fd15a7054 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/aws_iot_shadow_subscription.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/aws_iot_shadow_subscription.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/private/aws_iot_shadow_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/private/aws_iot_shadow_internal.h
index 2b9377dd6..2b9377dd6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/aws/shadow/src/private/aws_iot_shadow_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/aws/shadow/src/private/aws_iot_shadow_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/directories.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/directories.txt
index 4a57ab093..4a57ab093 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/directories.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/directories.txt
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_clock.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_clock.h
index 3b623ebc2..3b623ebc2 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_clock.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_clock.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_metrics.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_metrics.h
index c37251de6..c37251de6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_metrics.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_metrics.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_network.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_network.h
index 1426c94a2..1426c94a2 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_network.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_network.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_threads.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_threads.h
index f3c65f37e..f3c65f37e 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/iot_threads.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/iot_threads.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/types/iot_platform_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/types/iot_platform_types.h
index 3561ea744..3561ea744 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/platform/types/iot_platform_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/platform/types/iot_platform_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/atomic.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/atomic.h
index 7f5bdf9bb..7f5bdf9bb 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/atomic.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/atomic.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_atomic.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_atomic.h
index cffea33a6..cffea33a6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_atomic.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_atomic.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_error.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_error.h
index 965d4b5bc..965d4b5bc 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_error.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_error.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_init.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_init.h
index 34aa0ff55..34aa0ff55 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_init.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_init.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_linear_containers.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_linear_containers.h
index 251ed94c8..251ed94c8 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_linear_containers.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_linear_containers.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_logging.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_logging.h
index e4cb33d53..e4cb33d53 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_logging.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_logging.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_logging_setup.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_logging_setup.h
index 308b6e1a0..308b6e1a0 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_logging_setup.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_logging_setup.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_static_memory.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_static_memory.h
index 88a29bef6..88a29bef6 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/iot_static_memory.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/include/iot_static_memory.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/src/iot_logging.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/src/iot_logging.c
index 932f4e8f0..932f4e8f0 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/src/iot_logging.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/common/src/iot_logging.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/directories.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/directories.txt
index 315fd1420..315fd1420 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/directories.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/directories.txt
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/iot_https_client.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/iot_https_client.h
index 60d0de8d5..60d0de8d5 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/iot_https_client.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/iot_https_client.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/iot_https_utils.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/iot_https_utils.h
index 12bd4ef8e..12bd4ef8e 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/iot_https_utils.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/iot_https_utils.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/types/iot_https_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/types/iot_https_types.h
index fa2a698eb..fa2a698eb 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/include/types/iot_https_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/include/types/iot_https_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/iot_https_client.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/iot_https_client.c
index 6fd53684b..6fd53684b 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/iot_https_client.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/iot_https_client.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/iot_https_utils.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/iot_https_utils.c
index 3b0b5e7c5..3b0b5e7c5 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/iot_https_utils.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/iot_https_utils.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/private/iot_https_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/private/iot_https_internal.h
index a8e0526ef..a8e0526ef 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/https/src/private/iot_https_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/https/src/private/iot_https_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt.h
index e0f066fc5..e0f066fc5 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt_lightweight.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt_lightweight.h
index 20d5cfb9e..20d5cfb9e 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt_lightweight.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt_lightweight.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt_protocol.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt_protocol.h
index a32dc228e..a32dc228e 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/iot_mqtt_protocol.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/iot_mqtt_protocol.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/types/iot_mqtt_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/types/iot_mqtt_types.h
index d6db07695..d6db07695 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/include/types/iot_mqtt_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/include/types/iot_mqtt_types.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_api.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_api.c
index 6f5b56fc7..6f5b56fc7 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_api.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_helper.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_helper.c
index 8bf66e2f8..8bf66e2f8 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_helper.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_helper.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_lightweight_api.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_lightweight_api.c
index 3bbd3a5e2..3bbd3a5e2 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_lightweight_api.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_lightweight_api.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_network.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_network.c
index 1f9703322..1f9703322 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_network.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_network.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_operation.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_operation.c
index 986441d43..986441d43 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_operation.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_operation.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_serialize.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_serialize.c
index cd2189a88..cd2189a88 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_serialize.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_serialize.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_static_memory.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_static_memory.c
index 87b117550..87b117550 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_static_memory.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_static_memory.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_subscription.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_subscription.c
index 37b6c6384..37b6c6384 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_subscription.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_subscription.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_validate.c b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_validate.c
index cdcca62f0..cdcca62f0 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/iot_mqtt_validate.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/iot_mqtt_validate.c
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/private/iot_mqtt_helper.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/private/iot_mqtt_helper.h
index 519670df0..519670df0 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/private/iot_mqtt_helper.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/private/iot_mqtt_helper.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/private/iot_mqtt_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/private/iot_mqtt_internal.h
index 20d950a87..20d950a87 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/mqtt/src/private/iot_mqtt_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/c_sdk/standard/mqtt/src/private/iot_mqtt_internal.h
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/directories.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/directories.txt
index 0b6c18c8c..0b6c18c8c 100755
--- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/directories.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/directories.txt
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/readme.txt b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/readme.txt
index 1caf978e2..1caf978e2 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/readme.txt
+++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries-LTS-Beta1/readme.txt
diff --git a/README_FIRST.txt b/README_FIRST.txt
index ea74db10e..4d6a41769 100755
--- a/README_FIRST.txt
+++ b/README_FIRST.txt
@@ -35,12 +35,12 @@ following links:
 The Visual Studio projects for each of the FreeRTOS IoT library examples are
 located in sub-directories of the following top-level directories:
 
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/https
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/shadow
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/jobs
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/ota
-  + /FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/pkcs11
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/mqtt
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/https
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/shadow
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/jobs
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/ota
+  + /FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/pkcs11
 
 
 *** ADDITIONAL INFORMATION ***
diff --git a/tools/aws_config_offline/CertificateConfigurator.html b/tools/aws_config_offline/CertificateConfigurator.html
index e1d63d7c1..e0fe33bc7 100755
--- a/tools/aws_config_offline/CertificateConfigurator.html
+++ b/tools/aws_config_offline/CertificateConfigurator.html
@@ -67,7 +67,7 @@
                                 </div>
                                 <p class="text-primary" style="font-size:14px">
                                     <span class="glyphicon glyphicon-warning-sign" style="font-size:16px"></span>
-                                    Save the generated header file to the <i>FreeRTOS-Labs/Demo/FreeRTOS_IoT_Libraries/include</i> folder of the demo project.
+                                    Save the generated header file to the <i>FreeRTOS-Labs/Demo/FreeRTOS-IoT-Libraries-LTS-Beta1/include</i> folder of the demo project.
                                 </p>
                             </div>
                         </div>
diff --git a/tools/aws_config_quick_start/misc.py b/tools/aws_config_quick_start/misc.py
index 99286162e..f09e73b2e 100755
--- a/tools/aws_config_quick_start/misc.py
+++ b/tools/aws_config_quick_start/misc.py
@@ -65,7 +65,7 @@ def write_client_credentials(
     file_to_modify = os.path.join(source_dir,
                                   'FreeRTOS-Labs',
                                   'Demo',
-                                  'FreeRTOS_IoT_Libraries',
+                                  'FreeRTOS-IoT-Libraries-LTS-Beta1',
                                   'include',
                                   'aws_iot_demo_profile.h')
     file_text = ''
diff --git a/tools/memory_estimator/memory_estimator.py b/tools/memory_estimator/memory_estimator.py
index 2e123380d..828820f4f 100644
--- a/tools/memory_estimator/memory_estimator.py
+++ b/tools/memory_estimator/memory_estimator.py
@@ -20,7 +20,7 @@ __REPORT_LIBS_JSON__ = os.path.join(__THIS_FILE_PATH__, 'template', 'report_libs
 
 __FREERTOS_SRC_DIR__ = os.path.join('FreeRTOS', 'Source')
 __FREERTOS_PLUS_SRC_DIR__ = os.path.join('FreeRTOS-Plus', 'Source')
-__IOT_LIBS_DIR__ = os.path.join(__FREERTOS_PLUS_SRC_DIR__, 'FreeRTOS-IoT-Libraries')
+__IOT_LIBS_DIR__ = os.path.join(__FREERTOS_PLUS_SRC_DIR__, 'FreeRTOS-IoT-Libraries-LTS-Beta1')
 
 __LIB_NAME_TO_SRC_DIRS_MAPPING__ = {
     'light-mqtt' : [