diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7371147b1..a0da81330 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,8 @@ jobs:
       uses: actions/checkout@v1
 
     - name: clang-format lint
-      uses: DoozyX/clang-format-lint-action@v0.3.1
+      uses: DoozyX/clang-format-lint-action@v0.13
       with:
         # List of extensions to check
         extensions: cpp,h
+        clangFormatVersion: 11.1.0
diff --git a/devicedefender/CMakeLists.txt b/devicedefender/CMakeLists.txt
index c6acf050d..23a643086 100644
--- a/devicedefender/CMakeLists.txt
+++ b/devicedefender/CMakeLists.txt
@@ -99,15 +99,11 @@ target_include_directories(IotDeviceDefender-cpp PUBLIC
 if (BUILD_DEPS)
 	if (NOT IS_SUBDIRECTORY_INCLUDE)
 		aws_use_package(aws-crt-cpp)
-        endif()
-	aws_use_package(aws-c-iot)
-endif()
-
-if (BUILD_TESTING)
-    aws_use_package(IotDeviceCommon-cpp)
+        aws_use_package(aws-c-iot)
+    endif()
 endif()
 
-target_link_libraries(IotDeviceDefender-cpp ${DEP_AWS_LIBS})
+target_link_libraries(IotDeviceDefender-cpp IotDeviceCommon-cpp)
 
 install(FILES ${AWS_IOTDEVICEDEFENDER_HEADERS} DESTINATION "include/aws/iotdevicedefender/" COMPONENT Development)
 
diff --git a/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h b/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h
index 28078d0ad..dc2b703e2 100644
--- a/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h
+++ b/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h
@@ -416,7 +416,8 @@ namespace Aws
             ResultType GetResultType() const noexcept { return m_responseType; }
 
           private:
-            union AWS_EVENTSTREAMRPC_API OperationResult {
+            union AWS_EVENTSTREAMRPC_API OperationResult
+            {
                 OperationResult(Crt::ScopedResource<AbstractShapeBase> &&response) noexcept
                     : m_response(std::move(response))
                 {
@@ -445,12 +446,12 @@ namespace Aws
         {
             /* An interface shared by all operations for retrieving the response object given the model name. */
           public:
-            virtual ExpectedResponseFactory GetInitialResponseFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
-            virtual ExpectedResponseFactory GetStreamingResponseFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
-            virtual ErrorResponseFactory GetOperationErrorFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
+            virtual ExpectedResponseFactory GetInitialResponseFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
+            virtual ExpectedResponseFactory GetStreamingResponseFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
+            virtual ErrorResponseFactory GetOperationErrorFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
         };
 
         class AWS_EVENTSTREAMRPC_API ServiceModel
diff --git a/eventstream_rpc/tests/CMakeLists.txt b/eventstream_rpc/tests/CMakeLists.txt
index 1ddeb9771..988b2ef12 100644
--- a/eventstream_rpc/tests/CMakeLists.txt
+++ b/eventstream_rpc/tests/CMakeLists.txt
@@ -28,6 +28,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
     endif()
 endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -40,8 +41,6 @@ file(GLOB TESTS ${TEST_HDRS} ${TEST_SRC})
 
 set(TEST_BINARY_NAME ${PROJECT_NAME}-tests)
 
-aws_use_package(aws-crt-cpp)
-aws_use_package(EventstreamRpc-cpp)
 add_test_case(OperateWhileDisconnected)
 # The tests below can be commented out when an EchoRPC Server is running on 127.0.0.1:8033
 #add_test_case(EventStreamConnect)
diff --git a/eventstream_rpc/tests/EchoTestRpcModel.cpp b/eventstream_rpc/tests/EchoTestRpcModel.cpp
index 695504386..c0737ce68 100644
--- a/eventstream_rpc/tests/EchoTestRpcModel.cpp
+++ b/eventstream_rpc/tests/EchoTestRpcModel.cpp
@@ -1040,8 +1040,8 @@ namespace Awstest
         return Aws::Crt::String("awstest#CauseServiceErrorResponse");
     }
 
-    Aws::Crt::Optional<Aws::Crt::String> CauseServiceErrorOperationContext::GetStreamingResponseModelName() const
-        noexcept
+    Aws::Crt::Optional<Aws::Crt::String> CauseServiceErrorOperationContext::GetStreamingResponseModelName()
+        const noexcept
     {
         return Aws::Crt::Optional<Aws::Crt::String>();
     }
@@ -1107,15 +1107,15 @@ namespace Awstest
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> CauseStreamServiceToErrorOperationContext::
-        AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingResponse::s_allocateFromPayload(stringView, allocator);
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> CauseStreamServiceToErrorOperationContext::
-        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingMessage::s_allocateFromPayload(stringView, allocator);
     }
@@ -1201,8 +1201,8 @@ namespace Awstest
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> EchoStreamMessagesOperationContext::
-        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingMessage::s_allocateFromPayload(stringView, allocator);
     }
@@ -1217,8 +1217,8 @@ namespace Awstest
         return Aws::Crt::String("awstest#EchoStreamingResponse");
     }
 
-    Aws::Crt::Optional<Aws::Crt::String> EchoStreamMessagesOperationContext::GetStreamingResponseModelName() const
-        noexcept
+    Aws::Crt::Optional<Aws::Crt::String> EchoStreamMessagesOperationContext::GetStreamingResponseModelName()
+        const noexcept
     {
         return Aws::Crt::String("awstest#EchoStreamingMessage");
     }
diff --git a/greengrass_ipc/source/GreengrassCoreIpcModel.cpp b/greengrass_ipc/source/GreengrassCoreIpcModel.cpp
index e88411424..3d134525b 100644
--- a/greengrass_ipc/source/GreengrassCoreIpcModel.cpp
+++ b/greengrass_ipc/source/GreengrassCoreIpcModel.cpp
@@ -1293,8 +1293,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void ValidateConfigurationUpdateEvents::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void ValidateConfigurationUpdateEvents::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_chosenMember == TAG_VALIDATE_CONFIGURATION_UPDATE_EVENT &&
                 m_validateConfigurationUpdateEvent.has_value())
@@ -2212,8 +2212,8 @@ namespace Aws
             OperationError::s_customDeleter(static_cast<OperationError *>(shape));
         }
 
-        void VerifyClientDeviceIdentityResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void VerifyClientDeviceIdentityResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_isValidClientDevice.has_value())
             {
@@ -2262,8 +2262,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void VerifyClientDeviceIdentityRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void VerifyClientDeviceIdentityRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_credential.has_value())
             {
@@ -2357,8 +2357,8 @@ namespace Aws
             OperationError::s_customDeleter(static_cast<OperationError *>(shape));
         }
 
-        void ValidateAuthorizationTokenResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void ValidateAuthorizationTokenResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_isValid.has_value())
             {
@@ -2406,8 +2406,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void ValidateAuthorizationTokenRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void ValidateAuthorizationTokenRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_token.has_value())
             {
@@ -3314,8 +3314,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToConfigurationUpdateResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToConfigurationUpdateResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             (void)payloadObject;
         }
@@ -3359,8 +3359,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToConfigurationUpdateRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToConfigurationUpdateRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_componentName.has_value())
             {
@@ -3433,8 +3433,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToComponentUpdatesResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToComponentUpdatesResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             (void)payloadObject;
         }
@@ -3477,8 +3477,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToComponentUpdatesRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToComponentUpdatesRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             (void)payloadObject;
         }
@@ -3521,8 +3521,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToCertificateUpdatesResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToCertificateUpdatesResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             (void)payloadObject;
         }
@@ -3566,8 +3566,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SubscribeToCertificateUpdatesRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SubscribeToCertificateUpdatesRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_certificateOptions.has_value())
             {
@@ -3799,8 +3799,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SendConfigurationValidityReportResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SendConfigurationValidityReportResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             (void)payloadObject;
         }
@@ -3844,8 +3844,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void SendConfigurationValidityReportRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void SendConfigurationValidityReportRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_configurationValidityReport.has_value())
             {
@@ -5965,8 +5965,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void InvalidArtifactsDirectoryPathError::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void InvalidArtifactsDirectoryPathError::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_message.has_value())
             {
@@ -6401,8 +6401,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void InvalidClientDeviceAuthTokenError::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void InvalidClientDeviceAuthTokenError::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_message.has_value())
             {
@@ -6450,8 +6450,8 @@ namespace Aws
             OperationError::s_customDeleter(static_cast<OperationError *>(shape));
         }
 
-        void AuthorizeClientDeviceActionResponse::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void AuthorizeClientDeviceActionResponse::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_isAuthorized.has_value())
             {
@@ -6500,8 +6500,8 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(static_cast<AbstractShapeBase *>(shape));
         }
 
-        void AuthorizeClientDeviceActionRequest::SerializeToJsonObject(Aws::Crt::JsonObject &payloadObject) const
-            noexcept
+        void AuthorizeClientDeviceActionRequest::SerializeToJsonObject(
+            Aws::Crt::JsonObject &payloadObject) const noexcept
         {
             if (m_clientDeviceAuthToken.has_value())
             {
@@ -6606,15 +6606,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToIoTCoreOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToIoTCoreResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToIoTCoreOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return IoTCoreMessage::s_allocateFromPayload(stringView, allocator);
         }
@@ -6629,8 +6629,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#SubscribeToIoTCoreResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> SubscribeToIoTCoreOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> SubscribeToIoTCoreOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::String("aws.greengrass#IoTCoreMessage");
         }
@@ -6681,8 +6681,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ResumeComponentOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -6699,8 +6699,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#ResumeComponentResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> ResumeComponentOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> ResumeComponentOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -6743,15 +6743,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PublishToIoTCoreOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return PublishToIoTCoreResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PublishToIoTCoreOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -6768,8 +6768,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#PublishToIoTCoreResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> PublishToIoTCoreOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> PublishToIoTCoreOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -6844,15 +6844,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToConfigurationUpdateOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToConfigurationUpdateResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToConfigurationUpdateOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ConfigurationUpdateEvents::s_allocateFromPayload(stringView, allocator);
         }
@@ -6913,15 +6913,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> DeleteThingShadowOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return DeleteThingShadowResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> DeleteThingShadowOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -6938,8 +6938,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#DeleteThingShadowResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> DeleteThingShadowOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> DeleteThingShadowOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -6982,15 +6982,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PutComponentMetricOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return PutComponentMetricResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PutComponentMetricOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7007,8 +7007,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#PutComponentMetricResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> PutComponentMetricOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> PutComponentMetricOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7051,15 +7051,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> DeferComponentUpdateOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return DeferComponentUpdateResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> DeferComponentUpdateOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7076,8 +7076,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#DeferComponentUpdateResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> DeferComponentUpdateOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> DeferComponentUpdateOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7147,15 +7147,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToValidateConfigurationUpdatesOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToValidateConfigurationUpdatesResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToValidateConfigurationUpdatesOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ValidateConfigurationUpdateEvents::s_allocateFromPayload(stringView, allocator);
         }
@@ -7165,8 +7165,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#SubscribeToValidateConfigurationUpdatesRequest");
         }
 
-        Aws::Crt::String SubscribeToValidateConfigurationUpdatesOperationContext::GetInitialResponseModelName() const
-            noexcept
+        Aws::Crt::String SubscribeToValidateConfigurationUpdatesOperationContext::GetInitialResponseModelName()
+            const noexcept
         {
             return Aws::Crt::String("aws.greengrass#SubscribeToValidateConfigurationUpdatesResponse");
         }
@@ -7218,15 +7218,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetConfigurationOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return GetConfigurationResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetConfigurationOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7243,8 +7243,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#GetConfigurationResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> GetConfigurationOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> GetConfigurationOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7324,15 +7324,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToTopicOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToTopicResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToTopicOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscriptionResponseMessage::s_allocateFromPayload(stringView, allocator);
         }
@@ -7347,8 +7347,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#SubscribeToTopicResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> SubscribeToTopicOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> SubscribeToTopicOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::String("aws.greengrass#SubscriptionResponseMessage");
         }
@@ -7392,15 +7392,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetComponentDetailsOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return GetComponentDetailsResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetComponentDetailsOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7417,8 +7417,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#GetComponentDetailsResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> GetComponentDetailsOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> GetComponentDetailsOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7461,15 +7461,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetClientDeviceAuthTokenOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return GetClientDeviceAuthTokenResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetClientDeviceAuthTokenOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7537,8 +7537,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PublishToTopicOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7555,8 +7555,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#PublishToTopicResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> PublishToTopicOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> PublishToTopicOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7636,15 +7636,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToCertificateUpdatesOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToCertificateUpdatesResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToCertificateUpdatesOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return CertificateUpdateEvent::s_allocateFromPayload(stringView, allocator);
         }
@@ -7705,15 +7705,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> VerifyClientDeviceIdentityOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return VerifyClientDeviceIdentityResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> VerifyClientDeviceIdentityOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7774,15 +7774,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> AuthorizeClientDeviceActionOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return AuthorizeClientDeviceActionResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> AuthorizeClientDeviceActionOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7850,8 +7850,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ListComponentsOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7868,8 +7868,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#ListComponentsResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> ListComponentsOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> ListComponentsOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7911,15 +7911,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> CreateDebugPasswordOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return CreateDebugPasswordResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> CreateDebugPasswordOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -7936,8 +7936,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#CreateDebugPasswordResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> CreateDebugPasswordOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> CreateDebugPasswordOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -7987,8 +7987,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetThingShadowOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8005,8 +8005,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#GetThingShadowResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> GetThingShadowOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> GetThingShadowOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8048,15 +8048,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SendConfigurationValidityReportOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SendConfigurationValidityReportResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SendConfigurationValidityReportOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8119,15 +8119,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> UpdateThingShadowOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return UpdateThingShadowResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> UpdateThingShadowOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8144,8 +8144,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#UpdateThingShadowResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> UpdateThingShadowOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> UpdateThingShadowOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8188,15 +8188,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> UpdateConfigurationOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return UpdateConfigurationResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> UpdateConfigurationOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8213,8 +8213,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#UpdateConfigurationResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> UpdateConfigurationOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> UpdateConfigurationOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8257,15 +8257,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ValidateAuthorizationTokenOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ValidateAuthorizationTokenResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ValidateAuthorizationTokenOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8326,15 +8326,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> RestartComponentOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return RestartComponentResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> RestartComponentOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8351,8 +8351,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#RestartComponentResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> RestartComponentOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> RestartComponentOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8395,15 +8395,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetLocalDeploymentStatusOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return GetLocalDeploymentStatusResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetLocalDeploymentStatusOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8471,8 +8471,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> GetSecretValueOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8489,8 +8489,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#GetSecretValueResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> GetSecretValueOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> GetSecretValueOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8599,15 +8599,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ListNamedShadowsForThingOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ListNamedShadowsForThingResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ListNamedShadowsForThingOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8700,15 +8700,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToComponentUpdatesOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return SubscribeToComponentUpdatesResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> SubscribeToComponentUpdatesOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ComponentUpdatePolicyEvents::s_allocateFromPayload(stringView, allocator);
         }
@@ -8768,15 +8768,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ListLocalDeploymentsOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return ListLocalDeploymentsResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> ListLocalDeploymentsOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8793,8 +8793,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#ListLocalDeploymentsResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> ListLocalDeploymentsOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> ListLocalDeploymentsOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8862,8 +8862,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#StopComponentResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> StopComponentOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> StopComponentOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8912,8 +8912,8 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> PauseComponentOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
@@ -8930,8 +8930,8 @@ namespace Aws
             return Aws::Crt::String("aws.greengrass#PauseComponentResponse");
         }
 
-        Aws::Crt::Optional<Aws::Crt::String> PauseComponentOperationContext::GetStreamingResponseModelName() const
-            noexcept
+        Aws::Crt::Optional<Aws::Crt::String> PauseComponentOperationContext::GetStreamingResponseModelName()
+            const noexcept
         {
             return Aws::Crt::Optional<Aws::Crt::String>();
         }
@@ -8973,15 +8973,15 @@ namespace Aws
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> CreateLocalDeploymentOperationContext::
-            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             return CreateLocalDeploymentResponse::s_allocateFromPayload(stringView, allocator);
         }
 
         Aws::Crt::ScopedResource<AbstractShapeBase> CreateLocalDeploymentOperationContext::
-            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-            noexcept
+            AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+                const noexcept
         {
             (void)stringView;
             (void)allocator;
diff --git a/iotdevicecommon/CMakeLists.txt b/iotdevicecommon/CMakeLists.txt
index 4194ce4e9..63bd80c0d 100644
--- a/iotdevicecommon/CMakeLists.txt
+++ b/iotdevicecommon/CMakeLists.txt
@@ -44,6 +44,8 @@ if (WIN32)
     endif ()
 endif()
 
+aws_use_package(aws-c-iot)
+
 add_library(IotDeviceCommon-cpp ${AWS_IOTDEVICECOMMON_CPP_SRC})
 
 set_target_properties(IotDeviceCommon-cpp PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/secure_tunneling/CMakeLists.txt b/secure_tunneling/CMakeLists.txt
index e913c7316..fee437bd2 100644
--- a/secure_tunneling/CMakeLists.txt
+++ b/secure_tunneling/CMakeLists.txt
@@ -98,15 +98,11 @@ target_include_directories(IotSecureTunneling-cpp PUBLIC
 if (BUILD_DEPS)
 	if (NOT IS_SUBDIRECTORY_INCLUDE)
 		aws_use_package(aws-crt-cpp)
+        aws_use_package(aws-c-iot)
 	endif()
-	aws_use_package(aws-c-iot)
 endif()
 
-if (BUILD_TESTING)
-    aws_use_package(IotDeviceCommon-cpp)
-endif()
-
-target_link_libraries(IotSecureTunneling-cpp ${DEP_AWS_LIBS})
+target_link_libraries(IotSecureTunneling-cpp IotDeviceCommon-cpp)
 
 install(FILES ${AWS_IOTSECURETUNNELING_HEADERS} DESTINATION "include/aws/iotsecuretunneling/" COMPONENT Development)